summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-06 18:15:30 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-06 18:15:30 -0700
commitbbef618190fb484b28b7d441e6fc5d524027c4fa (patch)
treebb9dc3902e225621127f02f95251b77b9191e4df /kernel
parenta21bd69e1509b43823c317c3bf3f7ffa99884356 (diff)
parentb8fa2f3a82069304acac1f9e957d491585f4f49a (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TG3]: Fix crash during tg3_init_one(). [IPV6]: Revert recent change to rt6_check_dev(). [XFRM]: beet: fix IP option decapsulation [XFRM]: beet: fix beet mode decapsulation [XFRM]: beet: use IPOPT_NOP for option padding [XFRM]: beet: fix IP option encapsulation
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions