Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi
authorPaul Mackerras <paulus@samba.org>
Wed, 16 Apr 2008 21:45:35 +0000 (07:45 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 16 Apr 2008 21:45:35 +0000 (07:45 +1000)

Trivial merge