git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43231b5 4615943)
Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap... omap-for-v3.10/timer-signed
authorTony Lindgren <tony@atomide.com>
Wed, 3 Apr 2013 17:47:59 +0000 (10:47 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 3 Apr 2013 17:47:59 +0000 (10:47 -0700)
Conflicts:
arch/arm/mach-omap2/timer.c


Trivial merge
Pandora Kernel Repository