| commit | 80e98a9ca6ded6d0fb6c2362c07638cbe3c58e2c | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat May 24 00:44:17 2014 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat May 24 00:44:17 2014 +0200 |
| tree | ba98513f6b5d676980145fef7092910141009eaa | |
| parent | 3c2580173e3bc820a8f8c0db968f757b8eca7fe5 [diff] | |
| parent | eeda4cb92ee0fb63a5917738e107b0bc8168079e [diff] |
Merge branch 'bcm/cleanup' into next/soc Conflicts: arch/arm/mach-bcm/Kconfig