Merge branch 'linux-2.6' into for-linus
[pandora-kernel.git] / include / asm-ppc / zorro.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2