]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/video/omap/lcd_ams_delta.c
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6b3be844fa5ba6aa4bc6947d30102d13190451e9
tree899c85236642c66458ace5ea3986d453c03e8550tree | snapshot
parentc71cbb62fde774f96e506a05b82f20750942cc92commit | diff
parent93d74463d018ddf05c169ad399e62e90e0f82fc0commit | diff
Merge current mainline tree into linux-omap tree

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
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/Makefile diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-h2.c diff1 | diff2 | blob | history
arch/arm/plat-omap/dma.c diff1 | diff2 | blob | history
drivers/i2c/chips/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.