Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell...
authorPaul Mackerras <paulus@samba.org>
Mon, 3 Mar 2008 10:31:09 +0000 (21:31 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 3 Mar 2008 10:31:09 +0000 (21:31 +1100)

Trivial merge