]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 18 Sep 2012 05:38:55 +0000 (15:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 18 Sep 2012 05:38:55 +0000 (15:38 +1000)
commitddc586863264da681d27944267bb312c2ca06363
tree50bcca395ba4a04a52e33e32a4490df1fda40fb1
parent927bec2ffb948a3d3290dda3c3e2d00ff86f95cf
parent26581e4d6659984af5a37249acb1adf6b0b84fc2
Merge remote-tracking branch 'samsung/for-next'

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