Linus Torvalds 2a8ba8f032 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits) random: simplify fips mode crypto: authenc - Fix cryptlen calculation crypto: talitos - add support for sha224 crypto: talitos - add hash algorithms crypto: talitos - second prepare step for adding ahash algorithms crypto: talitos - prepare for adding ahash algorithms crypto: n2 - Add Niagara2 crypto driver crypto: skcipher - Add ablkcipher_walk interfaces crypto: testmgr - Add testing for async hashing and update/final crypto: tcrypt - Add speed tests for async hashing crypto: scatterwalk - Fix scatterwalk_done() test crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk padata: Use get_online_cpus/put_online_cpus in padata_free padata: Add some code comments padata: Flush the padata queues actively padata: Use a timer to handle remaining objects in the reorder queues crypto: shash - Remove usage of CRYPTO_MINALIGN crypto: mv_cesa - Use resource_size crypto: omap - OMAP macros corrected padata: Use get_online_cpus/put_online_cpus ... Fix up conflicts in arch/arm/mach-omap2/devices.c		2010-05-21 14:46:51 -07:00
..
accessibility
acpi	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2010-05-20 09:27:37 -07:00
atm
auxdisplay
base	driver-core: fix Typo in drivers/base/core.c for CONFIG_MODULE	2010-05-21 09:37:32 -07:00
block	generate "change" uevent for loop device	2010-05-21 09:37:30 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
cdrom
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2010-05-21 14:46:51 -07:00
clocksource	Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-05-19 17:10:57 -07:00
connector
cpufreq	Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-05-18 08:49:13 -07:00
cpuidle
crypto	crypto: talitos - add support for sha224	2010-05-19 19:21:53 +10:00
dca
dio
dma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-05-19 11:36:03 -07:00
edac
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
firmware	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
gpio	sysfs: Implement sysfs tagged directory support.	2010-05-21 09:37:31 -07:00
gpu	Merge branch 'drm-for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-05-21 11:14:52 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2010-05-21 10:51:03 -07:00
hwmon
i2c	i2c-nforce2: Remove redundant error messages on ACPI conflict	2010-05-21 18:41:01 +02:00
ide
idle
ieee1394
ieee802154
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
input	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2010-05-21 10:50:00 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
leds
lguest
macintosh	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-05-21 11:17:05 -07:00
mca
md	sysfs: Implement sysfs tagged directory support.	2010-05-21 09:37:31 -07:00
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
memstick
message	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-05-21 07:19:18 -07:00
mfd	Merge branch 'topic/asoc' into for-linus	2010-05-20 12:00:43 +02:00
misc	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-05-21 11:17:05 -07:00
mmc	Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm	2010-05-21 14:38:35 -07:00
mtd	Merge git://git.infradead.org/mtd-2.6	2010-05-21 07:25:43 -07:00
net	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
nubus
of
oprofile
parisc
parport
pci	pci: check caps from sysfs file open to read device dependent config space	2010-05-21 09:37:32 -07:00
pcmcia	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
platform
pnp
power	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
pps
ps3
rapidio	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
regulator	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
rtc	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
s390	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2010-05-21 10:48:32 -07:00
serial	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-05-21 11:17:05 -07:00
sfi
sh
sn
spi	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2010-05-21 10:50:00 -07:00
ssb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
staging	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
tc
telephony
thermal
uio
usb	Merge branch 'dbg-early-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb	2010-05-21 11:10:41 -07:00
uwb
vhost
video	Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm	2010-05-21 14:40:30 -07:00
virtio
vlynq
w1	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
watchdog	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00
xen
zorro	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
Kconfig
Makefile