Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
authorPaul Mackerras <paulus@samba.org>
Mon, 16 Jun 2008 04:30:47 +0000 (14:30 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 16 Jun 2008 04:30:47 +0000 (14:30 +1000)

Trivial merge