Merge branch 'integration' into for-linus
authorChris Mason <chris.mason@oracle.com>
Wed, 27 Jul 2011 20:13:10 +0000 (16:13 -0400)
committerChris Mason <chris.mason@oracle.com>
Wed, 27 Jul 2011 20:18:13 +0000 (16:18 -0400)

Trivial merge