David S. Miller 90d3ac15e5 Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' ...

Conflicts:
	arch/sparc/kernel/smp_32.c

With merge conflict help from Daniel Hellstrom.

Signed-off-by: David S. Miller <davem@davemloft.net>

2011-05-20 13:10:22 -07:00

..

acpi

Fix common misspellings

2011-03-31 11:26:23 -03:00

asm-generic

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

crypto

crypto: padlock - Move padlock.h into include/crypto

2011-01-07 14:52:00 +11:00

drm

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

keys

libceph: Create a new key type "ceph".

2011-03-29 12:11:24 -07:00

linux

Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'

2011-05-20 13:10:22 -07:00

math-emu

…

media

Fix common misspellings

2011-03-31 11:26:23 -03:00

mtd

…

net

net/9p: nwname should be an unsigned int

2011-04-15 15:26:15 -05:00

pcmcia

pcmcia: re-enable Zoomed Video support

2011-02-20 12:47:34 +01:00

rdma

RDMA: Update workqueue usage

2011-01-16 21:16:31 -08:00

rxrpc

Fix common misspellings

2011-03-31 11:26:23 -03:00

scsi

Fix common misspellings

2011-03-31 11:26:23 -03:00

sound

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

staging

[media] Altera FPGA firmware download module

2011-03-21 20:32:16 -03:00

target

Fix common misspellings

2011-03-31 11:26:23 -03:00

trace

block: make unplug timer trace event correspond to the schedule() unplug

2011-04-16 13:51:05 +02:00

video

Fix common misspellings

2011-03-31 11:26:23 -03:00

xen

Fix common misspellings

2011-03-31 11:26:23 -03:00

Kbuild

…