| commit | a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Mar 18 16:25:47 2014 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Mar 18 16:25:47 2014 +0100 |
| tree | ff2025ad147593b78b6b93b13727021a8ccc6a56 | |
| parent | 9ad2a24f370159c350e9ec5dd3b91a1f3d76234e [diff] | |
| parent | 4b8b5f25b7485eaf60a40f68451b3b7b741eef59 [diff] |
Merge branch 'cleanup/kconfig' into next/drivers This resolves a conflict between the new sti reset controller driver and the Kconfig cleanup. Signed-off-by: Arnd Bergmann <arnd@arndb.de>