From: Linus Torvalds Date: Fri, 16 Jan 2009 20:40:11 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: v2.6.29-rc2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=abcea859783f63c9140ebd9fcb69580d0832f2c8;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/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 --- abcea859783f63c9140ebd9fcb69580d0832f2c8