Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi...
authorPaul Mackerras <paulus@samba.org>
Tue, 20 Nov 2007 02:54:46 +0000 (13:54 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 20 Nov 2007 02:54:46 +0000 (13:54 +1100)

Trivial merge