Merge branches 'release' and 'hwmon-conflicts' into release
[linux-2.6] / arch / parisc / defpalo.conf
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2