Merge branches 'release', 'misc' and 'misc-2.6.25' into release
[linux-2.6] / arch / um / sys-ppc / miscthings.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2