]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'omap_dss2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 02:59:14 +0000 (12:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 02:59:14 +0000 (12:59 +1000)
commitdbfe69671ab62a5bbb15ed7817cdc00f827b2299
tree57872a53a60d1cc851fe54fdb03a0c8af1d6da67
parentca01e486c73676965d37b22b6e798b975c1d9a24
parentc50e86ce7c2961a41f2f7aa6e4fd6c99229ba205
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
drivers/video/omap2/dss/sdi.c
drivers/video/omap2/dss/sdi.c