]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 09:51:20 +0000 (19:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 09:51:20 +0000 (19:51 +1000)
commit1067e333bb87d05d00121d2a0d74376f5bf19496
tree6e89e163eddd9ce3da1effaa8c74ccecda378c07
parente0e089ad3187ff88f9a0c6ff1f14493e05e5064f
parentd42d84336828cf30f5d8ab559e805499208a02ec
Merge remote-tracking branch 'samsung/for-next'

Conflicts:
drivers/pinctrl/Makefile
drivers/gpu/drm/exynos/exynos_drm_fimd.c
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/video/s3c-fb.c