Merge branch 'for_paulus' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...
authorPaul Mackerras <paulus@samba.org>
Thu, 18 May 2006 23:23:47 +0000 (09:23 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 18 May 2006 23:23:47 +0000 (09:23 +1000)

Trivial merge