Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohan Hedberg <johan.hedberg@intel.com>
Thu, 16 Feb 2012 12:23:04 +0000 (14:23 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Thu, 16 Feb 2012 12:25:34 +0000 (14:25 +0200)
commit46479e698530b8197d601a23317b7c7654195338
tree710b2758ecd7d8a6ada37724c5d4c8027d5f358f
parent7b99b659d90c5d421cb1867295c78a4c0c030734
parentca994a36f585432458ead9133fcfe05440edbb7b
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next.git

Conflicts:
include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c
drivers/bluetooth/btusb.c
drivers/bluetooth/hci_bcsp.c
drivers/bluetooth/hci_ldisc.c