]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdb59b9d341424df6d621ebad62667fa579c3b7d5
treebb9dc3902e225621127f02f95251b77b9191e4df
parentac34acf6a30b179f0359a8b7ac82d50fc8d67c62
parentd9eb50471b2f733b5f3f735b08ce7b637a880028
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