git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d735ea 1dcb4f3)
Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Dec 2010 14:14:47 +0000 (14:14 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Dec 2010 14:14:47 +0000 (14:14 +0000)
Conflicts:
include/linux/mfd/wm8994/pdata.h


Trivial merge
Pandora Kernel Repository