Merge commit 'e26a9e0' into stable/for-linus-3.15
authorDavid Vrabel <david.vrabel@citrix.com>
Mon, 28 Apr 2014 09:31:04 +0000 (10:31 +0100)
committerDavid Vrabel <david.vrabel@citrix.com>
Mon, 28 Apr 2014 09:31:04 +0000 (10:31 +0100)

Trivial merge