Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[linux-2.6] / include / asm-m68k / sun3xprom.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2