son <chris.mason@oracle.com> 1324659060 -0500
committer Chris Mason <chris.mason@oracle.com> 1324659060 -0500

Merge branch 'integration' into for-linus
z