git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c71cbb6 93d7446)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Thu, 13 Mar 2008 08:59:16 +0000 (10:59 +0200)
committerTony Lindgren <tony@atomide.com>
Thu, 13 Mar 2008 08:59:16 +0000 (10:59 +0200)
Merge branches 'master' and 'linus'

Conflicts:

arch/arm/configs/omap_h2_1610_defconfig
arch/arm/configs/omap_osk_5912_defconfig
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap2/io.c
arch/arm/plat-omap/cpu-omap.c
arch/arm/plat-omap/gpio.c


Trivial merge
Pandora Kernel Repository