Merge branch 'merge' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer...
authorPaul Mackerras <paulus@samba.org>
Mon, 24 Nov 2008 00:53:58 +0000 (11:53 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 24 Nov 2008 00:53:58 +0000 (11:53 +1100)

Trivial merge