git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 914f21b db89120)
Merge remote-tracking branch 'voltage/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:27:49 +0000 (12:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:27:49 +0000 (12:27 +1000)
Conflicts:
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/regulator/Makefile


Trivial merge
Pandora Kernel Repository