diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-08 19:52:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-08 19:52:43 -0800 |
| commit | f7a8db89c1f42e504bb12d2ae399cd96f755a7db (patch) | |
| tree | 0b98001ee746784e95a0809a8499483ace2450d5 /include | |
| parent | 6f84b4dbe92e3ffb00f4d8cbe9a31b5be5ecd8ca (diff) | |
| parent | c49b9f295e513753e6d9bb4444ba502f1aa59b29 (diff) | |
| download | op-kernel-dev-f7a8db89c1f42e504bb12d2ae399cd96f755a7db.zip op-kernel-dev-f7a8db89c1f42e504bb12d2ae399cd96f755a7db.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
tproxy: fixe a possible read from an invalid location in the socket match
zd1211rw: use unaligned safe memcmp() in-place of compare_ether_addr()
mac80211: use unaligned safe memcmp() in-place of compare_ether_addr()
ipw2200: fix netif_*_queue() removal regression
iwlwifi: clean key table in iwl_clear_stations_table function
tcp: tcp_vegas ssthresh bug fix
can: omit received RTR frames for single ID filter lists
ATM: CVE-2008-5079: duplicate listen() on socket corrupts the vcc table
netx-eth: initialize per device spinlock
tcp: make urg+gso work for real this time
enc28j60: Fix sporadic packet loss (corrected again)
hysdn: fix writing outside the field on 64 bits
b1isa: fix b1isa_exit() to really remove registered capi controllers
can: Fix CAN_(EFF|RTR)_FLAG handling in can_filter
Phonet: do not dump addresses from other namespaces
netlabel: Fix a potential NULL pointer dereference
bnx2: Add workaround to handle missed MSI.
xfrm: Fix kernel panic when flush and dump SPD entries
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 e9ca210..f50785a 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" |
