Pandora Sourcecodes - pandora-kernel.git/commit

git.openpandora.org / pandora-kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c0be7da 3085354)

author	Tony Lindgren <tony@atomide.com>
	Fri, 28 Mar 2008 10:59:38 +0000 (12:59 +0200)
committer	Tony Lindgren <tony@atomide.com>
	Fri, 28 Mar 2008 10:59:38 +0000 (12:59 +0200)
commit	6f19ae4ef12a69feba69bf5234c43c5ff7b9b970
tree	3cbd392927d6957d6ed5d0a91186a1973875c003	tree \| snapshot
parent	c0be7da69f40c2d3e593227e1be46abdf7f97529	commit \| diff
parent	3085354de635179d70c240e6d942bcbd1d93056c	commit \| diff

Merge current mainline tree into linux-omap tree

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/proc-xscale.S	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/ads7846.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Kconfig	diff1 \|	diff2 \|	blob \| history

Pandora Kernel Repository