git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e49583 5d80f8e)
Merge branch 'origin' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 28 Mar 2009 20:29:51 +0000 (20:29 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 28 Mar 2009 20:29:51 +0000 (20:29 +0000)
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c


Trivial merge
Pandora Kernel Repository