| commit | e65d61db588a057b5cbc3ba9bc8110819e05d748 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri Mar 21 19:41:33 2014 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri Mar 21 19:41:33 2014 +0100 |
| tree | e0efdc406f513bade80b4a92812ed11b456adc9f | |
| parent | 1bdb3a992a6f8c508431d54a3c9db99f117683ba [diff] | |
| parent | f08beab7c1786a3f5baf5f3a306e2ae118202525 [diff] |
Merge branch 'for-next' into warnings/3.15 Conflicts: arch/arm/Kconfig.debug arch/arm/mach-at91/Kconfig