git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bfb6aa a532f97)
Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 15 Aug 2010 13:56:40 +0000 (14:56 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 15 Aug 2010 13:56:40 +0000 (14:56 +0100)
Trivial overlap with the removal of the local revision variable.

Conflicts:
sound/soc/codecs/wm8994.c


Trivial merge
Pandora Kernel Repository