From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 5 Jan 2016 11:07:28 +0000 (+0000)
Subject: Merge branches 'misc' and 'misc-rc6' into for-linus
X-Git-Tag: v4.5-rc1~142^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=598bcc6ea6ec4032d2ace8b1b43d11b4708af072;p=users%2Fdwmw2%2Flinux.git

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

598bcc6ea6ec4032d2ace8b1b43d11b4708af072