Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
Paul Mackerras [Tue, 13 Nov 2007 03:28:40 +0000 (14:28 +1100)]

Trivial merge