From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 7 Apr 2007 01:15:30 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.21-rc7~44
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bbef618190fb484b28b7d441e6fc5d524027c4fa;p=linux-2.6-omap-h63xx.git

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
---

bbef618190fb484b28b7d441e6fc5d524027c4fa