Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...
authorPaul Mackerras <paulus@samba.org>
Thu, 7 Feb 2008 09:27:36 +0000 (20:27 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 7 Feb 2008 09:27:36 +0000 (20:27 +1100)

Trivial merge