Trond Myklebust 8aa0a410af Merge commit 'nfs-for-3.3-4' into nfs-for-next ...

Conflicts:
	fs/nfs/nfs4proc.c

Back-merge of the upstream kernel in order to fix a conflict with the
slotid type conversion and implementation id patches...

2012-03-03 15:05:56 -05:00

..

acpi

Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release

2012-01-23 19:47:06 -05:00

asm-generic

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

crypto

crypto: serpent-sse2 - add lrw support

2011-11-21 16:13:24 +08:00

drm

drm: Fix authentication kernel crash

2012-01-25 09:27:45 +00:00

keys

keys: add a "logon" key type

2012-01-17 22:39:40 -06:00

linux

Merge commit 'nfs-for-3.3-4' into nfs-for-next

2012-03-03 15:05:56 -05:00

math-emu

…

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-01-18 12:53:54 -08:00

misc

…

mtd

mtd: document that MEMWRITE ioctl is NAND-specific

2012-01-09 18:18:36 +00:00

net

net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL

2012-01-30 12:41:06 -05:00

pcmcia

…

rdma

rdma/core: Fix sparse warnings

2012-01-04 09:17:45 -08:00

rxrpc

…

scsi

[SCSI] libfc: Declare local functions static

2012-01-16 12:45:48 +04:00

sound

Merge branch 'fix/asoc' into for-linus

2012-01-31 15:13:14 +01:00

target

target: Set additional sense length field in sense data

2011-12-16 06:29:04 +00:00

trace

SUNRPC: Adding status trace points

2012-02-06 10:37:53 -05:00

video

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

xen

Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block

2012-01-15 12:48:41 -08:00

Kbuild

…