Merge commit 'v2.6.34-rc2' into for-2.6.34
authorMark Brown <[email protected]>
Mon, 22 Mar 2010 11:17:26 +0000 (11:17 +0000)
committerMark Brown <[email protected]>
Mon, 22 Mar 2010 11:17:26 +0000 (11:17 +0000)

Trivial merge