Merge branch 'fixes-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak...
authorPaul Mackerras <paulus@samba.org>
Wed, 17 Oct 2007 12:30:43 +0000 (22:30 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 17 Oct 2007 12:30:43 +0000 (22:30 +1000)

Trivial merge