]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Nov 2011 19:54:33 +0000 (14:54 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Nov 2011 19:54:33 +0000 (14:54 -0500)
commitd3ea7878a9d32350c96082769505b6cacea9c7f3
tree095d936b751b0a92946fcf710fb74dea7f8f33f7
parent6dd0b67efc33c828d69884823acb45f9e149347b
parente935fbdec12fcd573fcbd6893ca7cd3be3478a2b
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next

Conflicts:
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
drivers/bluetooth/btusb.c
include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/sock.c