Merge branch 'merge' into powerpc-next
authorPaul Mackerras <paulus@samba.org>
Fri, 23 May 2008 06:53:23 +0000 (16:53 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 23 May 2008 06:53:23 +0000 (16:53 +1000)

Trivial merge