git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b67dcba 19b08b3)
Merge tag 'omap-fixes-for-cleanup-for-v3.5' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 11 May 2012 18:59:45 +0000 (11:59 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 11 May 2012 18:59:45 +0000 (11:59 -0700)
Turns out the earlier omap-cleanup-sparse-for-v3.5
up introduced one compile issue and a new warning.

Conflicts:
arch/arm/mach-omap1/common.h


Trivial merge
Pandora Kernel Repository