git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31504f2 c264320)
Merge for-next
authorTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 20:24:01 +0000 (13:24 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 20:24:01 +0000 (13:24 -0700)
Conflicts:
arch/arm/configs/n8x0_defconfig


Trivial merge
Pandora Kernel Repository