git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0be7da 3085354)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Fri, 28 Mar 2008 10:59:38 +0000 (12:59 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 28 Mar 2008 10:59:38 +0000 (12:59 +0200)
Merge branches 'master' and 'linus'

Conflicts:

arch/arm/plat-omap/Makefile
arch/arm/plat-omap/gpio.c
drivers/i2c/busses/i2c-omap.c
include/asm-arm/arch-omap/dsp_common.h


Trivial merge
Pandora Kernel Repository