]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 05:14:15 +0000 (15:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 05:14:15 +0000 (15:14 +1000)
commit0829745bb338e5a1dd849b4428e7cf91c3570470
tree236b880cae222d55762ba2f5573f402a82f902fd
parenta189b73d26e0047a88ecec4c85d85449fc8ef1e7
parent5779e9aeb38be2be1e5b7a38519ee3057b42739e
Merge remote-tracking branch 'samsung/for-next'

Conflicts:
drivers/pinctrl/Makefile
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/video/s3c-fb.c