kevin/linux
1
Fork 0
Code
44b52bccf8
linux/arch/arm
History
Linus Torvalds b8716614a7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 
Pull crypto update from Herbert Xu:
 "* sha512 bug fixes (already in your tree).
  * SHA224/SHA384 AEAD support in caam.
  * X86-64 optimised version of Camellia.
  * Tegra AES support.
  * Bulk algorithm registration interface to make driver registration easier.
  * padata race fixes.
  * Misc fixes."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)
  padata: Fix race on sequence number wrap
  padata: Fix race in the serialization path
  crypto: camellia - add assembler implementation for x86_64
  crypto: camellia - rename camellia.c to camellia_generic.c
  crypto: camellia - fix checkpatch warnings
  crypto: camellia - rename camellia module to camellia_generic
  crypto: tcrypt - add more camellia tests
  crypto: testmgr - add more camellia test vectors
  crypto: camellia - simplify key setup and CAMELLIA_ROUNDSM macro
  crypto: twofish-x86_64/i586 - set alignmask to zero
  crypto: blowfish-x86_64 - set alignmask to zero
  crypto: serpent-sse2 - combine ablk_*_init functions
  crypto: blowfish-x86_64 - use crypto_[un]register_algs
  crypto: twofish-x86_64-3way - use crypto_[un]register_algs
  crypto: serpent-sse2 - use crypto_[un]register_algs
  crypto: serpent-sse2 - remove dead code from serpent_sse2_glue.c::serpent_sse2_init()
  crypto: twofish-x86 - Remove dead code from twofish_glue_3way.c::init()
  crypto: In crypto_add_alg(), 'exact' wants to be initialized to 0
  crypto: caam - fix gcc 4.6 warning
  crypto: Add bulk algorithm registration interface
  ...
2012-03-21 13:20:43 -07:00
..
boot Core device tree changes for Linux v3.4 2012-03-21 10:30:03 -07:00
common Generialize powerpc's irq_host as irq_domain 2012-03-21 10:27:19 -07:00
configs Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
include/asm Generialize powerpc's irq_host as irq_domain 2012-03-21 10:27:19 -07:00
kernel Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-03-20 10:31:44 -07:00
lib ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts 2012-01-25 11:07:40 +00:00
mach-at91 ARM: at91/dma: DMA controller registering with DT support 2012-02-29 18:20:39 +01:00
mach-bcmring Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-03-20 21:12:50 -07:00
mach-clps711x
mach-cns3xxx
mach-davinci ARM: davinci: update mdio bus name 2012-01-27 22:29:09 +05:30
mach-dove ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -08:00
mach-ebsa110
mach-ep93xx ARM: ep93xx: convert vision_ep9307 to MULTI_IRQ_HANDLER 2012-03-06 15:57:56 +00:00
mach-exynos Generialize powerpc's irq_host as irq_domain 2012-03-21 10:27:19 -07:00
mach-footbridge
mach-gemini
mach-h720x
mach-highbank ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
mach-imx regulator: Updates for 3.4 2012-03-21 10:34:56 -07:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-ixp23xx
mach-ixp2000
mach-kirkwood ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -08:00
mach-ks8695 ARM, KS8695: Only include linux/gpio.h once in arch/arm/mach-ks8695/leds.c 2012-02-10 09:52:18 +01:00
mach-l7200/include/mach
mach-lpc32xx ARM: LPC32xx: serial.c: Fixed loop limit 2012-02-27 17:28:03 +01:00
mach-mmp arch/arm/mach-mmp/: some files include some headers twice 2012-02-16 23:24:30 +08:00
mach-msm irq_domain: Remove irq_domain_add_simple() 2012-02-16 06:11:23 -07:00
mach-mv78xx0 ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -08:00
mach-mxs
mach-netx
mach-nomadik
mach-omap1 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-03-20 21:12:50 -07:00
mach-omap2 Generialize powerpc's irq_host as irq_domain 2012-03-21 10:27:19 -07:00
mach-orion5x Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-03-20 21:12:50 -07:00
mach-picoxcell
mach-pnx4008
mach-prima2 irq_domain: Remove irq_domain_add_simple() 2012-02-16 06:11:23 -07:00
mach-pxa Merge 3.3-rc7 into usb-next 2012-03-12 09:13:31 -07:00
mach-realview ARM: 7298/1: realview: fix mapping of MPCore private memory region 2012-01-25 09:24:36 +00:00
mach-rpc
mach-s3c64xx ARM: S3C6410: Use device names for both I2C clocks 2012-01-27 14:43:44 +09:00
mach-s3c2410 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-s3c2412 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-s3c2416 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-s3c2440 ARM: S3C2440: Fixed build error for s3c244x 2012-03-08 08:57:29 -08:00
mach-s3c2443 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-s5p64x0 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-s5pc100
mach-s5pv210 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-sa1100 Merge branch 'sa11x0-mcp-fixes' into fixes 2012-01-26 21:06:54 +00:00
mach-shark
mach-shmobile Power management updates for 3.4 2012-03-21 10:15:51 -07:00
mach-spear3xx arm: Fix typo in spear3[012]0.c 2012-02-21 11:44:45 +01:00
mach-spear6xx
mach-tegra Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-03-21 13:20:43 -07:00
mach-u300 ARM: U300: Don't specify regulator consumers by struct device 2012-02-17 13:42:49 -08:00
mach-ux500 ARM: 7346/1: errata: fix PL310 erratum #753970 workaround selection 2012-02-27 11:22:38 +00:00
mach-versatile irq_domain: Remove 'new' irq_domain in favour of the ppc one 2012-02-16 06:11:23 -07:00
mach-vexpress ARM: 7346/1: errata: fix PL310 erratum #753970 workaround selection 2012-02-27 11:22:38 +00:00
mach-vt8500
mach-w90x900
mach-zynq
mm Merge branch 'kmap_atomic' of git://github.com/congwang/linux 2012-03-21 09:40:26 -07:00
nwfpe
oprofile
plat-iop
plat-mxc regulator: Updates for 3.4 2012-03-21 10:34:56 -07:00
plat-nomadik
plat-omap ARM: OMAP: irqs: Fix NR_IRQS value to handle PRCM interrupts 2012-02-28 15:49:54 -08:00
plat-orion ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -08:00
plat-pxa
plat-s3c24xx Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-03-20 21:12:50 -07:00
plat-s5p
plat-samsung ARM: SAMSUNG: Fix memory size for hsotg 2012-03-01 13:19:47 +09:00
plat-spear ARM: 7348/1: arm/spear600: fix one-shot timer 2012-02-27 11:18:40 +00:00
plat-versatile ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
tools
vfp
Kconfig ARM: 7345/1: errata: update workaround for A9 erratum #743622 2012-02-27 11:22:08 +00:00
Kconfig-nommu
Kconfig.debug
Makefile Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00