]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 06:34:40 +0000 (16:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 06:34:40 +0000 (16:34 +1000)
commit14426aa4f5a4e8674d5d18e395f464e78090d878
treed54539ad42071162875550fee1bfe97d36b1d985
parentccf1600a652ec3e96080a9ce0ac7b6e81733c4e3
parent5779e9aeb38be2be1e5b7a38519ee3057b42739e
Merge remote-tracking branch 'samsung/for-next'

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