summaryrefslogtreecommitdiffstats
path: root/drivers/net/acenic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-28 21:54:07 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-28 21:54:07 +0100
commit541ef5cbb8e68189d47272cea52a69abc30259bc (patch)
tree09c871320e6918ebb9b642a632971b364684d8a3 /drivers/net/acenic.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 (diff)
parentm68k: use the new byteorder headers (diff)
downloadlinux-541ef5cbb8e68189d47272cea52a69abc30259bc.tar.xz
linux-541ef5cbb8e68189d47272cea52a69abc30259bc.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: use the new byteorder headers fbcon: Protect free_irq() by MACH_IS_ATARI check fbcon: remove broken mac vbl handler m68k: fix trigraph ignored warning in setox.S macfb annotations and compiler warning fix m68k: mac baboon interrupt enable/disable m68k: machw.h cleanup m68k: Mac via cleanup and commentry m68k: Reinstate mac rtc
Diffstat (limited to 'drivers/net/acenic.c')
0 files changed, 0 insertions, 0 deletions