Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
authorPaul Mackerras <paulus@samba.org>
Thu, 8 Feb 2007 04:03:11 +0000 (15:03 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 8 Feb 2007 04:03:11 +0000 (15:03 +1100)

Trivial merge