tree 6ff94ff3b08b838353b9127eb5f8055b3de6b25f
parent b828f960215f02e5d2c88bbd27565c694254a15a
parent b60752f2b20c167859943e001727f0d4da419b23
author Russell King <rmk+kernel@armlinux.org.uk> 1475740603 +0100
committer Russell King <rmk+kernel@armlinux.org.uk> 1475740603 +0100

Merge branches 'misc' and 'sa1111-base' into for-linus