git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4146b71 6d02643)
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/tmp-merge
authorTony Lindgren <tony@atomide.com>
Thu, 25 Oct 2012 18:29:59 +0000 (11:29 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 25 Oct 2012 18:29:59 +0000 (11:29 -0700)
Conflicts:
arch/arm/mach-omap2/common-board-devices.c
arch/arm/mach-omap2/common-board-devices.h
arch/arm/mach-omap2/omap_hwmod_44xx_data.c


Trivial merge
Pandora Kernel Repository