Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
authorPaul Mackerras <paulus@samba.org>
Fri, 14 Dec 2007 05:46:50 +0000 (16:46 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 14 Dec 2007 05:46:50 +0000 (16:46 +1100)

Trivial merge