| commit | abcea859783f63c9140ebd9fcb69580d0832f2c8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 16 12:40:11 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 16 12:40:11 2009 -0800 |
| tree | b769dd06a0fcf8e86849f31fd1f62358eb7209d0 | |
| parent | 4b48d9d44ebe0e8c31b4fe3b7480941576fff613 [diff] | |
| parent | 009777846165fcc49352c0f1487e3a96102884c3 [diff] |
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