Merge branch 'devel' into linux-next
authorTrond Myklebust <trond.myklebust@primarydata.com>
Mon, 17 Mar 2014 19:15:21 +0000 (15:15 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Mon, 17 Mar 2014 19:15:21 +0000 (15:15 -0400)

Trivial merge