From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 28 Jan 2014 21:38:48 +0000 (+0000)
Subject: Merge branches 'fixes' and 'misc' into for-linus
X-Git-Tag: v3.14-rc1~58^2~1
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=f5137a45c20713f06535b7d952b72b673c27488f

Merge branches 'fixes' and 'misc' into for-linus
---

f5137a45c20713f06535b7d952b72b673c27488f