]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fbdev/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 04:06:44 +0000 (14:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 04:06:44 +0000 (14:06 +1000)
commit1d8b940c3427c9ea64bea63e7ddbd1dc14dcef93
tree8e5ed877b235a141ba9fed6fb6cc705833eea4dd
parent42b3311816df07f22be726f9bf8fe78bcfcdfdde
parent8ea2c86449bdf0fe32fd043c714054962d8802ca
Merge remote-tracking branch 'fbdev/for-next'

Conflicts:
drivers/video/of_display_timing.c
drivers/video/of_display_timing.c