Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/pasem...
authorPaul Mackerras <paulus@samba.org>
Wed, 5 Dec 2007 05:13:25 +0000 (16:13 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 5 Dec 2007 05:13:25 +0000 (16:13 +1100)

Trivial merge