]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
Merge branch 'gemini_fix' of git://git.berlios.de/gemini-board into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 7 May 2010 20:39:35 +0000 (21:39 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 7 May 2010 20:39:35 +0000 (21:39 +0100)

Trivial merge