Merge branch 'devel/for-linus-3.19' into stable/for-linus-3.19
authorDavid Vrabel <david.vrabel@citrix.com>
Mon, 15 Dec 2014 16:41:00 +0000 (16:41 +0000)
committerDavid Vrabel <david.vrabel@citrix.com>
Mon, 15 Dec 2014 16:41:00 +0000 (16:41 +0000)

Trivial merge