John W. Linville c487606f83 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ... Conflicts: net/nfc/netlink.c Signed-off-by: John W. Linville <linville@tuxdriver.com>		2012-09-28 11:11:16 -04:00
..
acpi	Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base	2012-08-03 00:31:23 -04:00
asm-generic	mutex: Place lock in contended state after fastpath_lock failure	2012-08-13 18:46:54 +02:00
crypto
drm	drm: Drop the NV12M and YUV420M formats	2012-09-13 12:38:10 +09:00
keys
linux	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-09-28 11:11:16 -04:00
math-emu
media	[media] v4l2: add core support for the new VIDIOC_ENUM_FREQ_BANDS ioctl	2012-07-30 20:23:05 -03:00
memory
misc
mtd
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-09-28 11:11:16 -04:00
pcmcia
ras
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	scsi_netlink: Remove dead and buggy code	2012-09-13 16:26:39 -04:00
sound	ASoC: Additional updates for 3.6	2012-08-20 21:26:04 +02:00
target	target: Remove unused se_cmd.cmd_spdtl	2012-08-21 14:27:35 -07:00
trace	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-08-03 10:57:20 -07:00
video	video: da8xx-fb: configure FIFO threshold to reduce underflow errors	2012-07-29 01:11:09 +00:00
xen	Revert "xen PVonHVM: move shared_info to MMIO before kexec"	2012-08-16 13:05:25 -04:00
Kbuild