]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6f19ae4ef12a69feba69bf5234c43c5ff7b9b970
tree3cbd392927d6957d6ed5d0a91186a1973875c003tree | snapshot
parentc0be7da69f40c2d3e593227e1be46abdf7f97529commit | diff
parent3085354de635179d70c240e6d942bcbd1d93056ccommit | 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
Unnamed repository; edit this file 'description' to name the repository.