Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
authorPaul Mackerras <paulus@samba.org>
Tue, 20 May 2008 09:46:37 +0000 (19:46 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 20 May 2008 09:46:37 +0000 (19:46 +1000)

Trivial merge