Merge branch 'for_paulus' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...
authorPaul Mackerras <paulus@samba.org>
Sat, 1 Apr 2006 11:08:26 +0000 (22:08 +1100)
committerPaul Mackerras <paulus@samba.org>
Sat, 1 Apr 2006 11:08:26 +0000 (22:08 +1100)

Trivial merge