Jiri Kosina 818b930bc1 Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus ... Conflicts: drivers/hid/hid-core.c		2012-12-12 21:41:55 +01:00
..
bnep	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
cmtp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
hidp	Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus	2012-12-12 21:41:55 +01:00
rfcomm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-10-02 13:38:27 -07:00
a2mp.c
af_bluetooth.c	userns: Properly print bluetooth socket uids	2012-10-12 13:16:47 -07:00
hci_conn.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next	2012-09-24 14:39:16 -04:00
hci_core.c	Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2012-09-30 02:30:16 -04:00
hci_event.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next	2012-09-24 14:39:16 -04:00
hci_sock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
hci_sysfs.c
Kconfig
l2cap_core.c	Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2012-09-30 02:30:16 -04:00
l2cap_sock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
lib.c
Makefile
mgmt.c	Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2012-09-30 02:30:16 -04:00
sco.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-09-07 15:07:55 -04:00
smp.c	Bluetooth: SMP: Fix setting unknown auth_req bits	2012-10-12 17:55:20 +08:00