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
..
accessibility
acpi
amba
ata	ata: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:16 +08:00
atm	eni: fix driver remove function and driver probe error path.	2012-03-16 23:13:20 -07:00
auxdisplay
base	Core device tree changes for Linux v3.4	2012-03-21 10:30:03 -07:00
bcma
block	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
bluetooth
cdrom
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-03-21 13:20:43 -07:00
clk
clocksource	Power management updates for 3.4	2012-03-21 10:15:51 -07:00
connector
cpufreq
cpuidle
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-03-21 13:20:43 -07:00
dca
devfreq	PM / devfreq: add relation of recommended frequency.	2012-03-17 21:51:34 +01:00
dio
dma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
edac	edac: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:17 +08:00
eisa
firewire
firmware
gpio
gpu	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-03-20 21:11:42 -07:00
hv	Tools: hv: Support enumeration from all the pools	2012-03-16 13:36:04 -07:00
hwmon	hwmon changes for v3.4	2012-03-21 10:37:25 -07:00
hwspinlock
i2c	i2c-algo-bit: Fix spurious SCL timeouts under heavy load	2012-03-15 18:11:05 +01:00
ide	ide: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:17 +08:00
idle
ieee802154
infiniband	InfiniBand/RDMA changes for the 3.4 merge window. Nothing big really	2012-03-21 10:33:42 -07:00
input	driver core merge for 3.4-rc1	2012-03-20 11:16:20 -07:00
iommu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-03-20 21:04:47 -07:00
leds
lguest
macintosh	Core device tree changes for Linux v3.4	2012-03-21 10:30:03 -07:00
mca
md	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
media	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
memstick	memstick: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:19 +08:00
message
mfd	regulator: Updates for 3.4	2012-03-21 10:34:56 -07:00
misc	tty and serial merge for 3.4-rc1	2012-03-20 11:24:39 -07:00
mmc	Power management updates for 3.4	2012-03-21 10:15:51 -07:00
mtd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
net	InfiniBand/RDMA changes for the 3.4 merge window. Nothing big really	2012-03-21 10:33:42 -07:00
nfc
nubus
of	Core device tree changes for Linux v3.4	2012-03-21 10:30:03 -07:00
oprofile
parisc
parport
pci	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-03-20 21:04:47 -07:00
pcmcia	Merge 3.3-rc6 into driver-core-next	2012-03-09 12:35:53 -08:00
pinctrl
platform	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
pnp
power	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
pps
ps3
ptp	phc: Update author's email address.	2012-03-17 01:41:43 -07:00
rapidio	rapidio/tsi721: fix bug in register offset definitions	2012-03-15 17:03:03 -07:00
regulator	regulator: Updates for 3.4	2012-03-21 10:34:56 -07:00
rtc	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-20 10:32:09 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-03-20 21:04:47 -07:00
sbus
scsi	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
sfi
sh
sn
spi	SPI changes for v3.4.	2012-03-21 10:32:00 -07:00
ssb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-03-20 21:04:47 -07:00
staging	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
target	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
tc
thermal
tty	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
uio
usb	USB merge for 3.4-rc1	2012-03-20 11:26:30 -07:00
uwb
vhost	vhost: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00
video	drivers/video/backlight/s6e63m0.c: fix corruption storing gamma mode	2012-03-15 17:03:04 -07:00
virt
virtio
vlynq
w1
watchdog
xen
zorro
Kconfig
Makefile