Merge remote-tracking branch 'jens/for-4.1/core' into dm/for-next
authorMike Snitzer <snitzer@redhat.com>
Tue, 31 Mar 2015 16:00:32 +0000 (12:00 -0400)
committerMike Snitzer <snitzer@redhat.com>
Tue, 31 Mar 2015 16:00:32 +0000 (12:00 -0400)

Trivial merge