Merge branch 'srp' into for-next
authorRoland Dreier <roland@purestorage.com>
Sat, 1 Dec 2012 01:41:04 +0000 (17:41 -0800)
committerRoland Dreier <roland@purestorage.com>
Sat, 1 Dec 2012 01:41:04 +0000 (17:41 -0800)

Trivial merge