]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 17 Oct 2009 15:29:01 +0000 (16:29 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 17 Oct 2009 15:29:01 +0000 (16:29 +0100)

Trivial merge