Merge commit 'origin/master'
[linux-2.6] / drivers / block / paride / ppc6lnx.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2