projects / platform / kernel / linux-3.10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c5b1fb 974a658)
Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev...
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Wed, 25 Jul 2012 08:55:46 +0000 (08:55 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Wed, 25 Jul 2012 08:55:46 +0000 (08:55 +0000)
Conflicts:
drivers/video/omap2/dss/core.c
drivers/video/omap2/dss/dispc.c


Trivial merge
Domain: System / Kernel;