diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-11 16:54:41 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-11 16:54:41 +0100 |
| commit | 7888b61c15d3661cd56d97fa1a078e48824d5d72 (patch) | |
| tree | 19a349d5dec2799eb516b653f0813ccb66124ed1 /net/bluetooth/af_bluetooth.c | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff) | |
| parent | Bluetooth: Fix handling of L2CAP Command Reject over LE (diff) | |
| download | linux-7888b61c15d3661cd56d97fa1a078e48824d5d72.tar.xz linux-7888b61c15d3661cd56d97fa1a078e48824d5d72.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/af_bluetooth.c')
| -rw-r--r-- | net/bluetooth/af_bluetooth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 56ca494621c6..0c5866bb49b6 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -31,7 +31,7 @@ #include <net/bluetooth/bluetooth.h> #include <linux/proc_fs.h> -#define VERSION "2.17" +#define VERSION "2.18" /* Bluetooth sockets */ #define BT_MAX_PROTO 8 |