Pandora Sourcecodes - pandora-kernel.git/commit

git.openpandora.org / pandora-kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9ad2a24 4b8b5f2)

author	Arnd Bergmann <arnd@arndb.de>
	Tue, 18 Mar 2014 15:25:47 +0000 (16:25 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Tue, 18 Mar 2014 15:25:47 +0000 (16:25 +0100)
commit	a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d
tree	ff2025ad147593b78b6b93b13727021a8ccc6a56	tree \| snapshot
parent	9ad2a24f370159c350e9ec5dd3b91a1f3d76234e	commit \| diff
parent	4b8b5f25b7485eaf60a40f68451b3b7b741eef59	commit \| 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>

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sti/Kconfig	diff1 \|	diff2 \|	blob \| history

Pandora Kernel Repository