Jeff Garzik 8407884dd9 Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream ... Two bits were appended to the end of the bitfield list in struct scsi_device. Resolve that conflict by including both bits. Conflicts: include/scsi/scsi_device.h		2012-07-25 15:58:48 -04:00
..
acpi	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
asm-generic	mm: cma: fix condition check when setting global cma area	2012-07-06 12:02:04 +02:00
crypto
drm	drm: drop comment about this header being autogenerated.	2012-06-22 11:04:55 +01:00
keys
linux	Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream	2012-07-25 15:58:48 -04:00
math-emu
media
memory
misc
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-07-24 10:01:50 -07:00
pcmcia
rdma	Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus	2012-07-22 23:26:17 -07:00
rxrpc
scsi	Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream	2012-07-25 15:58:48 -04:00
sound	Merge branch 'topic/pm-convert' into for-next	2012-07-19 08:21:57 +02:00
target	target: Allow for target_submit_cmd() returning errors	2012-07-17 17:05:05 -07:00
trace	Merge branch 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2012-07-24 17:46:16 -07:00
video	fbdev updates for 3.5	2012-06-01 16:57:51 -07:00
xen	xen PVonHVM: move shared_info to MMIO before kexec	2012-07-19 15:52:05 -04:00
Kbuild