git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5480ed fa514fb)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev...
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Mon, 29 Aug 2011 09:14:30 +0000 (09:14 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Mon, 29 Aug 2011 09:14:30 +0000 (09:14 +0000)
Conflicts:
drivers/video/atmel_lcdfb.c


Trivial merge
Pandora Kernel Repository