Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx
authorPaul Mackerras <paulus@samba.org>
Mon, 22 Oct 2007 22:45:23 +0000 (08:45 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 22 Oct 2007 22:45:23 +0000 (08:45 +1000)

Trivial merge