David Woodhouse 67577927e8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ... Conflicts: drivers/mtd/mtd_blkdevs.c Merge Grant's device-tree bits so that we can apply the subsequent fixes. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>		2010-10-30 12:35:11 +01:00
..
acpi	ACPI: Fix typos	2010-09-28 21:38:19 -04:00
asm-generic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2010-10-22 19:59:04 -07:00
crypto	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
drm	drm/ttm: Fix two race conditions + fix busy codepaths	2010-10-06 09:04:43 +10:00
keys	DNS: Separate out CIFS DNS Resolver code	2010-08-05 17:17:51 +00:00
linux	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2010-10-30 12:35:11 +01:00
math-emu
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-10-25 07:59:01 -07:00
mtd	mtd: Define MLC Flash as a different flash type	2010-10-25 00:50:20 +01:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
pcmcia	pcmcia: IOCARD is also required for using IRQs	2010-10-22 08:46:36 +02:00
rdma	IB: Rename RAW_ETY to RAW_ETHERTYPE	2010-08-04 10:44:19 -07:00
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-10-22 20:30:48 -07:00
sound	driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices	2010-10-22 10:16:43 -07:00
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2010-10-22 17:13:10 -07:00
video	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
xen	xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield	2010-08-23 12:01:35 +01:00
Kbuild