diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:04:35 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:04:35 -0500 |
| commit | db18014f65f62879e70be55898be3fd68a3363a8 (patch) | |
| tree | 90d5e33852753f43d76d25f8d22a64a9e5bd94e8 /net/bluetooth/af_bluetooth.c | |
| parent | c77986c78aa941af8266272841567e78b72d54cc (diff) | |
| parent | 668b7b19820b0801c425d31cc27fd6f499050e5c (diff) | |
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 0c5866bb49b6..2021c481cdb6 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.18" +#define VERSION "2.19" /* Bluetooth sockets */ #define BT_MAX_PROTO 8 |