Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 7 Apr 2007 01:15:30 +0000 (18:15 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 7 Apr 2007 01:15:30 +0000 (18:15 -0700)
commitbbef618190fb484b28b7d441e6fc5d524027c4fa
treebb9dc3902e225621127f02f95251b77b9191e4df
parenta21bd69e1509b43823c317c3bf3f7ffa99884356
parentb8fa2f3a82069304acac1f9e957d491585f4f49a
Merge /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