Stephen Rothwell 5f00bcb38e Merge branch 'master' into devel and apply fixup from Stephen Rothwell: ... vfs/nfs: fixup for nfs_open_context change Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>		2011-07-25 14:53:52 -04:00
..
acpi	Merge branches 'd3cold', 'bugzilla-37412' and 'bugzilla-38152' into release	2011-07-14 00:16:38 -04:00
asm-generic	iomap: make IOPORT/PCI mapping functions conditional	2011-07-22 18:46:26 +02:00
crypto	net: remove mm.h inclusion from netdevice.h	2011-06-21 19:17:20 -07:00
drm	drm/radeon/kms: add new NI pci ids	2011-07-15 16:10:55 +01:00
keys
linux	Merge branch 'master' into devel and apply fixup from Stephen Rothwell:	2011-07-25 14:53:52 -04:00
math-emu
media	[media] tuner-core/v4l2-subdev: document that the type field has to be filled in	2011-07-07 15:04:23 -03:00
mtd
net	fs/9p: add 9P2000.L unlinkat operation	2011-07-23 09:32:52 -05:00
pcmcia
rdma	IB/pma: Add include file for IBA performance counters definitions	2011-07-18 21:04:35 -07:00
rxrpc
scsi	[SCSI] libfc, tcm_fc: add ddp_targ() to libfc function template to supprot FCoE DDP in target mode	2011-06-29 16:28:39 -05:00
sound	Merge branch 'topic/misc' into for-linus	2011-07-22 08:43:24 +02:00
target	target: Bump version to v4.1.0-rc1-ml	2011-07-22 09:37:49 +00:00
trace	Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2011-07-24 09:06:47 -07:00
video
xen	Merge branch 'stable/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-07-22 13:45:15 -07:00
Kbuild