summaryrefslogtreecommitdiffstats
path: root/include/net/slhc_vj.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-04 16:52:21 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-04 16:52:21 +0100
commit25431e900dc47abb312c9ae8599e8c8ae038eb5a (patch)
tree3d67ac01e65668d673bfee18cfeb0ed8bc0027fa /include/net/slhc_vj.h
parentMerge branch 'for-linus' of git://git.o-hand.com/linux-mfd (diff)
parentsunrpc: fix rdma dependencies (diff)
downloadlinux-25431e900dc47abb312c9ae8599e8c8ae038eb5a.tar.xz
linux-25431e900dc47abb312c9ae8599e8c8ae038eb5a.zip
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: sunrpc: fix rdma dependencies e1000: Fix PCI enable to honor the need_ioport flag sgi-xp: link XPNET's net_device_ops to its net_device structure pcnet_cs: Fix misuse of the equality operator. hso: add new device id's dca: redesign locks to fix deadlocks cassini/sungem: limit reaches -1, but 0 tested net: variables reach -1, but 0 tested qlge: bugfix: Add missing netif_napi_del call. qlge: bugfix: Add flash offset for second port. qlge: bugfix: Fix endian issue when reading flash. udp: increments sk_drops in __udp_queue_rcv_skb() net: Fix userland breakage wrt. linux/if_tunnel.h net: packet socket packet_lookup_frame fix
Diffstat (limited to 'include/net/slhc_vj.h')
0 files changed, 0 insertions, 0 deletions