Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jan 2009 20:40:11 +0000 (12:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jan 2009 20:40:11 +0000 (12:40 -0800)
commitabcea859783f63c9140ebd9fcb69580d0832f2c8
treeb769dd06a0fcf8e86849f31fd1f62358eb7209d0
parent4b48d9d44ebe0e8c31b4fe3b7480941576fff613
parent009777846165fcc49352c0f1487e3a96102884c3
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  netxen: include ipv6.h (fixes build failure)
  netxen: avoid invalid iounmap