git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed6cd4a b54e2c9 ad145e0)
Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Fri, 18 Feb 2011 00:24:12 +0000 (16:24 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 18 Feb 2011 00:24:12 +0000 (16:24 -0800)
Conflicts:
arch/arm/plat-omap/include/plat/irqs.h


Trivial merge
Pandora Kernel Repository