Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git
Conflicts: include/net/bluetooth/l2cap.h net/bluetooth/hci_conn.c net/bluetooth/l2cap_core.c
This commit is contained in:
@@ -49,8 +49,8 @@
|
||||
|
||||
#define VERSION "0.3"
|
||||
|
||||
static int txcrc = 1;
|
||||
static int hciextn = 1;
|
||||
static bool txcrc = 1;
|
||||
static bool hciextn = 1;
|
||||
|
||||
#define BCSP_TXWINSIZE 4
|
||||
|
||||
|
Reference in New Issue
Block a user