Merge branch 'linux-2.6' into merge
authorPaul Mackerras <[email protected]>
Tue, 25 Mar 2008 02:31:46 +0000 (13:31 +1100)
committerPaul Mackerras <[email protected]>
Tue, 25 Mar 2008 02:31:46 +0000 (13:31 +1100)

Trivial merge