David S. Miller 2bd93d7af1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

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

2011-04-26 12:16:46 -07:00

..

bnep

Bluetooth: Use kthread API in bnep

2011-04-05 12:40:47 -03:00

cmtp

Bluetooth: Use kthread API in cmtp

2011-04-05 12:40:47 -03:00

hidp

Bluetooth: Use kthread API in hidp

2011-04-05 12:40:46 -03:00

rfcomm

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

2011-03-16 16:29:25 -07:00

af_bluetooth.c

Bluetooth: remove unnecessary call to hci_sock_cleanup

2011-02-25 22:36:58 -03:00

hci_conn.c

Bluetooth: Use ERR_PTR as return error from hci_connect

2011-02-27 17:11:29 -03:00

hci_core.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-04-26 12:16:46 -07:00

hci_event.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-04-26 12:16:46 -07:00

hci_sock.c

Bluetooth: fix build break on hci_sock.c

2011-02-22 08:43:52 -03:00

hci_sysfs.c

Bluetooth: convert net/bluetooth/ to kstrtox

2011-04-05 13:21:11 -03:00

Kconfig

Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig

2011-02-28 14:06:53 -05:00

l2cap_core.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-04-26 12:16:46 -07:00

l2cap_sock.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2011-04-25 14:34:25 -04:00

lib.c

Bluetooth: make batostr() print in the right order

2010-10-12 12:44:52 -03:00

Makefile

Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko

2011-02-14 17:27:36 -03:00

mgmt.c

Bluetooth: Use GFP_KERNEL in user context

2011-04-05 13:03:10 -03:00

sco.c

Bluetooth: fix shutdown on SCO sockets

2011-04-18 20:11:46 -03:00