git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ec5c96 efd13be)
Merge branch 'davinci' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Jul 2009 18:18:46 +0000 (19:18 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Jul 2009 18:18:46 +0000 (19:18 +0100)
Conflicts:
sound/soc/davinci/davinci-i2s.c


Trivial merge
Pandora Kernel Repository