Merge branch 'for-linus' into for-next
authorMike Snitzer <snitzer@redhat.com>
Wed, 12 Mar 2014 17:52:15 +0000 (13:52 -0400)
committerMike Snitzer <snitzer@redhat.com>
Wed, 12 Mar 2014 17:52:15 +0000 (13:52 -0400)

Trivial merge