David S. Miller 67f4efdce7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor line offset auto-merges.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-11-17 22:00:43 -05:00

..

bnep

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2012-10-19 15:22:27 -04:00

cmtp

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2012-10-19 15:22:27 -04:00

hidp

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2012-10-19 15:22:27 -04:00

rfcomm

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2012-10-19 15:22:27 -04:00

a2mp.c

Bluetooth: AMP: Get amp_mgr reference in HS hci_conn

2012-10-18 07:27:20 -03:00

af_bluetooth.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2012-10-19 15:22:27 -04:00

amp.c

Bluetooth: AMP: Get amp_mgr reference in HS hci_conn

2012-10-18 07:27:20 -03:00

hci_conn.c

Bluetooth: AMP: Add handle to hci_chan structure

2012-10-11 14:33:05 +08:00

hci_core.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-17 22:00:43 -05:00

hci_event.c

Bluetooth: AMP: Handle AMP_LINK connection

2012-10-11 14:34:24 +08: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

Bluetooth: Use %pMR in sprintf/seq_printf instead of batostr

2012-09-27 18:10:15 -03:00

Kconfig

Bluetooth: AMP: Add AMP key calculation

2012-09-27 17:30:22 -03:00

l2cap_core.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2012-10-19 15:22:27 -04:00

l2cap_sock.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2012-10-19 15:22:27 -04:00

lib.c

bluetooth: Remove unneeded batostr function

2012-09-27 18:10:43 -03:00

Makefile

Bluetooth: AMP: Use HCI cmd to Read Loc AMP Assoc

2012-09-27 17:10:32 -03:00

mgmt.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-17 22:00:43 -05:00

sco.c

Bluetooth: Use %pMR in sprintf/seq_printf instead of batostr

2012-09-27 18:10:15 -03:00

smp.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-17 22:00:43 -05:00