Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release
[sfrench/cifs-2.6.git] / include / asm-m68k / nubus.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2