Merge branch 'cluster' into for-next
authorNeilBrown <neilb@suse.de>
Tue, 21 Apr 2015 22:00:20 +0000 (08:00 +1000)
committerNeilBrown <neilb@suse.de>
Tue, 21 Apr 2015 22:00:20 +0000 (08:00 +1000)

Trivial merge