Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
authorPaul Mackerras <paulus@samba.org>
Wed, 22 Apr 2009 03:02:09 +0000 (13:02 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 22 Apr 2009 03:02:09 +0000 (13:02 +1000)

Trivial merge