tree e0efdc406f513bade80b4a92812ed11b456adc9f
parent 1bdb3a992a6f8c508431d54a3c9db99f117683ba
parent f08beab7c1786a3f5baf5f3a306e2ae118202525
author Arnd Bergmann <arnd@arndb.de> 1395427293 +0100
committer Arnd Bergmann <arnd@arndb.de> 1395427293 +0100

Merge branch 'for-next' into warnings/3.15

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm/mach-at91/Kconfig