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

Trivial merge