aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-16 12:40:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-16 12:40:11 -0800
commitabcea859783f63c9140ebd9fcb69580d0832f2c8 (patch)
treeb769dd06a0fcf8e86849f31fd1f62358eb7209d0 /Makefile
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff)
parentnetxen: include ipv6.h (fixes build failure) (diff)
downloadlinux-dev-abcea859783f63c9140ebd9fcb69580d0832f2c8.tar.xz
linux-dev-abcea859783f63c9140ebd9fcb69580d0832f2c8.zip
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions