tree 75355c4aa6a14d1790406c02ef04231d6d11e3f3
parent 54c0a4b46150db1571d955d598cd342c9f1d9657
parent d326b65c57d64208646206d0bfd4e2d19d6df38c
parent c5ca95b507c8a2a69e49eeda539b41bd76922d7f
author Russell King <rmk+kernel@arm.linux.org.uk> 1390945128 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1390945128 +0000

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