aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-04 13:44:17 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-04 13:44:17 -0500
commit439f61b9f9ebbf84fb7e6b3539fc3794e046bbb9 (patch)
tree9aeec0e7248175ece16586552bb44655bdcbe028 /include
parent2022c1f136067f673964dcaffa1cae1008ddcd74 (diff)
parent7fde4d779b83898851959f837c9b26fe07ee91c9 (diff)
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: [ISDN]: i4l: Fix DLE handling for i4l-audio [ISDN] i4l: 'NO CARRIER' message lost after ldisc flush [CONNECTOR]: Return proper error code in cn_call_callback() [INET]: Fix netdev renaming and inet address labels [CASSINI]: Bump driver version and release date. [CASSINI]: Fix two obvious NAPI bugs. [CASSINI]: Set skb->truesize properly on receive packets. [CASSINI]: Program parent Intel31154 bridge when necessary. [CASSINI]: Revert 'dont touch page_count'. [CASSINI]: Fix endianness bug. [XFRM]: Do not define km_migrate() if !CONFIG_XFRM_MIGRATE [X25]: Add missing x25_neigh_put
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions