]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 01:14:50 +0000 (12:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 01:14:50 +0000 (12:14 +1100)
commit1e25d7db9be8d3515e503f4ae4aae066d4da6ce0
treec8474608c6c63dae78b8ef3ec430dd8155319656
parentdea27b79c3621a383c4f9183e59b856d447f53da
parent495d818b3b4d4409c4c063c7f65540bedfc9862a
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile
arch/arm/mach-exynos4/Kconfig