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

Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

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

2011-12-23 17:13:56 -05:00

..

bnep

module_param: make bool parameters really bool (net & drivers/net)

2011-12-19 22:27:29 -05:00

cmtp

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

2011-12-03 08:26:25 +09:00

hidp

Bluetooth: Fix hidp_get_connection()

2011-11-07 17:24:55 -02:00

rfcomm

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

2011-12-23 17:13:56 -05:00

af_bluetooth.c

Bluetooth: Handle fragmented skbs in bt_sock_stream_recvmsg()

2011-09-27 18:16:07 -03:00

hci_conn.c

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

2011-12-23 17:13:56 -05:00

hci_core.c

Bluetooth: remove old code

2011-12-02 21:26:59 +09:00

hci_event.c

module_param: make bool parameters really bool (net & drivers/net)

2011-12-19 22:27:29 -05:00

hci_sock.c

module_param: make bool parameters really bool (net & drivers/net)

2011-12-19 22:27:29 -05:00

hci_sysfs.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

Kconfig

bluetooth: uses crypto interfaces, select CRYPTO

2011-06-27 15:09:39 -04:00

l2cap_core.c

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

2011-12-23 17:13:56 -05:00

l2cap_sock.c

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

2011-12-06 16:02:05 -05:00

lib.c

Bluetooth: Add bt_printk

2011-06-30 19:17:12 -03:00

Makefile

Bluetooth: Implement the first SMP commands

2011-06-13 15:11:55 -03:00

mgmt.c

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

2011-12-06 16:02:05 -05:00

sco.c

module_param: make bool parameters really bool (net & drivers/net)

2011-12-19 22:27:29 -05:00

smp.c

Bluetooth: Centralize SMP pairing failure handling

2011-12-01 22:54:37 +09:00