diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-06 01:54:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-06 01:54:40 -0500 |
| commit | 730c30ec646bd252a9448a66ecd51d794853513f (patch) | |
| tree | c0d413860f9d8bf37374f17cfabb4911143465d7 /include | |
| parent | 726e07a8a38168266ac95d87736f9501a2d9e7b2 (diff) | |
| parent | 0a0755c9fe47dc9f8271935909c66096e43efbfe (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/can/core.h | 2 |
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 @@ | |||
| 19 | #include <linux/skbuff.h> | 19 | #include <linux/skbuff.h> |
| 20 | #include <linux/netdevice.h> | 20 | #include <linux/netdevice.h> |
| 21 | 21 | ||
| 22 | #define CAN_VERSION "20071116" | 22 | #define CAN_VERSION "20081130" |
| 23 | 23 | ||
| 24 | /* increment this number each time you change some user-space interface */ | 24 | /* increment this number each time you change some user-space interface */ |
| 25 | #define CAN_ABI_VERSION "8" | 25 | #define CAN_ABI_VERSION "8" |