Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...
authorPaul Mackerras <paulus@samba.org>
Tue, 20 Nov 2007 00:39:26 +0000 (11:39 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 20 Nov 2007 00:39:26 +0000 (11:39 +1100)

Trivial merge