git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19fce0d 8c01dfa)
Merge branch 'tmp-merge'
authorTony Lindgren <tony@atomide.com>
Fri, 22 Jun 2012 09:09:42 +0000 (02:09 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 22 Jun 2012 09:09:42 +0000 (02:09 -0700)
Conflicts:
arch/arm/mach-omap2/dsp.c
arch/arm/mach-omap2/io.c


Trivial merge
Pandora Kernel Repository