Merge branch 'merge'
[linux-2.6] / arch / ppc / platforms / lwmon.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2