Merge from Linus' tree.
[powerpc.git] / arch / ppc / platforms / apus_setup.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2