summaryrefslogtreecommitdiff
path: root/include/linux/can/core.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-12-16 06:38:58 +0300
committerPaul Mackerras <paulus@samba.org>2008-12-16 06:38:58 +0300
commit1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch)
tree0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /include/linux/can/core.h
parent91cac623262c1c0cd298c5c648a8bd2b647c264d (diff)
parent23e0e8afafd9ac065d81506524adf3339584044b (diff)
downloadlinux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.xz
Merge branch 'merge' into next
Diffstat (limited to 'include/linux/can/core.h')
-rw-r--r--include/linux/can/core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/can/core.h b/include/linux/can/core.h
index e9ca210ffa5b..f50785ad4781 100644
--- a/include/linux/can/core.h
+++ b/include/linux/can/core.h
@@ -19,7 +19,7 @@
#include <linux/skbuff.h>
#include <linux/netdevice.h>
-#define CAN_VERSION "20071116"
+#define CAN_VERSION "20081130"
/* increment this number each time you change some user-space interface */
#define CAN_ABI_VERSION "8"