]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fbdev/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 04:09:43 +0000 (14:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 04:09:43 +0000 (14:09 +1000)
commite6b4a6a1da569887b31bcf94e5c6add37fd43be0
treeb257a8aadd6fbd4a04a966e3c9e48172e9761501
parent9776afcf1a53729cada9e8bfdfe5cc1d2a31b6ff
parenta66e62ae56307e587e93d7ed4d83ea34c71d2eb9
Merge remote-tracking branch 'fbdev/for-next'

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