git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 219e2d6 9cd68fa)
Merge branch 'devel-late' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 02:38:15 +0000 (19:38 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 02:38:15 +0000 (19:38 -0700)
Conflicts:
arch/arm/mach-omap2/devices.c
drivers/spi/spi-omap2-mcspi.c


Trivial merge
Pandora Kernel Repository