Merge branch 'misc' into for-next
authorRoland Dreier <roland@purestorage.com>
Mon, 14 Oct 2013 17:10:46 +0000 (10:10 -0700)
committerRoland Dreier <roland@purestorage.com>
Mon, 14 Oct 2013 17:10:46 +0000 (10:10 -0700)

Trivial merge