Trond Myklebust 8626e4a426 Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6 ... Resolve conflicts with the VFS atomic open and sget changes. Conflicts: fs/nfs/nfs4proc.c		2012-07-16 12:01:42 -04:00
..
acpi
asm-generic	bug.h: Fix up CONFIG_BUG=n implicit function declarations.	2012-06-25 10:32:49 -07:00
crypto
drm	drm: drop comment about this header being autogenerated.	2012-06-22 11:04:55 +01:00
keys
linux	Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6	2012-07-16 12:01:42 -04:00
math-emu
media
memory
misc
mtd
net	sctp: be more restrictive in transport selection on bundled sacks	2012-06-30 22:44:35 -07:00
pcmcia
rdma
rxrpc
scsi	[SCSI] libsas: fix taskfile corruption in sas_ata_qc_fill_rtf	2012-07-08 09:49:14 +01:00
sound	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-06-25 14:53:09 -07:00
target
trace
video
xen
Kbuild