projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b99b65 ca994a3)
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)
Conflicts:
include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c

1  2 
drivers/bluetooth/btusb.c patch | diff1 | diff2 | blob | history
drivers/bluetooth/hci_bcsp.c patch | diff1 | diff2 | blob | history
drivers/bluetooth/hci_ldisc.c patch | diff1 | diff2 | blob | history

diff --cc drivers/bluetooth/btusb.c
Simple merge
diff --cc drivers/bluetooth/hci_bcsp.c
Simple merge
diff --cc drivers/bluetooth/hci_ldisc.c
Simple merge
John Crispins staging tree