Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/pasemi
authorPaul Mackerras <paulus@samba.org>
Mon, 31 Dec 2007 02:54:13 +0000 (13:54 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 31 Dec 2007 02:54:13 +0000 (13:54 +1100)

Trivial merge