Merge branch 'upstream' into upstream-jgarzik
[linux-2.6] / drivers / parisc / Makefile
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2