John W. Linville 312fef7d18 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next ... Conflicts: net/bluetooth/l2cap_sock.c net/bluetooth/mgmt.c		2011-11-09 14:54:33 -05:00
..
acpi	Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2011-08-03 21:53:27 -10:00
asm-generic	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
crypto
drm	drm: Separate EDID Header Check from EDID Block Check	2011-08-04 14:39:35 +01:00
keys
linux	vlan: allow nested vlan_do_receive()	2011-10-30 04:43:30 -04:00
math-emu
media	doc: fix broken references	2011-09-27 18:08:04 +02:00
mtd
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2011-11-09 14:54:33 -05:00
pcmcia	pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3	2011-08-08 16:04:11 -04:00
rdma	net: consolidate and fix ethtool_ops->get_settings calling	2011-09-15 17:32:26 -04:00
rxrpc	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
scsi	ore: RAID5 Write	2011-10-24 17:15:33 -07:00
sound	PM QoS: Minor clean-ups	2011-08-25 15:35:12 +02:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
trace	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:08:43 +02:00
video	OMAP: DSS2: Remove unused opt_clock_available	2011-07-25 10:22:05 +03:00
xen	Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-10-25 09:19:36 +02:00
Kbuild