Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
[linux-2.6] / arch / ppc64 / kernel / pmac_nvram.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2