pilppa.com Git - linux-2.6-omap-h63xx.git/commit

Merge omap-upstream

Merge branches 'master' and 'omap-upstream'

Conflicts:

arch/arm/Kconfig
arch/arm/boot/compressed/head.S
arch/arm/configs/omap_h2_1610_defconfig
arch/arm/configs/omap_osk_5912_defconfig
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-apollon-keys.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-n800-audio.c
arch/arm/mach-omap2/board-n800-dsp.c
arch/arm/mach-omap2/board-n800-usb.c
arch/arm/mach-omap2/board-n800.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/irq.c
arch/arm/mach-omap2/memory.c
arch/arm/mach-omap2/mux.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/sleep.S
arch/arm/mm/proc-v7.S
arch/arm/plat-omap/Makefile
arch/arm/plat-omap/common.c
arch/arm/plat-omap/timer32k.c
drivers/char/watchdog/omap_wdt.c
drivers/i2c/chips/Makefile
drivers/i2c/chips/menelaus.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/omap2_mcspi.c
drivers/video/omap/Kconfig
drivers/video/omap/Makefile
drivers/video/omap/blizzard.c
drivers/video/omap/dispc.c
drivers/video/omap/lcd_inn1510.c
drivers/video/omap/lcd_inn1610.c
drivers/video/omap/lcd_palmte.c
drivers/video/omap/lcd_palmtt.c
drivers/video/omap/lcd_palmz71.c
drivers/video/omap/lcd_sx1.c
drivers/video/omap/lcdc.c
drivers/video/omap/omapfb_main.c
drivers/video/omap/rfbi.c
drivers/video/omap/sossi.c
include/asm-arm/arch-omap/board-2430sdp.h
include/asm-arm/arch-omap/eac.h
include/asm-arm/arch-omap/gpio.h
include/asm-arm/arch-omap/hardware.h
include/asm-arm/arch-omap/io.h
include/asm-arm/arch-omap/menelaus.h
include/asm-arm/arch-omap/mmc.h
include/asm-arm/arch-omap/omap24xx.h
include/asm-arm/arch-omap/onenand.h
include/asm-arm/arch-omap/pm.h
include/linux/input.h
kernel/printk.c

author	Tony Lindgren <tony@atomide.com>
	Mon, 6 Aug 2007 12:44:03 +0000 (05:44 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Mon, 6 Aug 2007 12:44:03 +0000 (05:44 -0700)
commit	5669d107117726fb431567917c2b40646dbd7fd2
tree	f0bb70c99a8eba66b3cfc8b504921e20315e578f	tree \| snapshot
parent	2a1c4dfbbe9fd7f756e62579bb42d341d340bd0f	commit \| diff
parent	d6ba5a85cbf5b522de3b167c47e0ecfddb58d196	commit \| diff

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/entry-common.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/mmu.c	diff1 \|	\|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/dsp/dsp_common.c	diff1 \|	\|	blob \| history
arch/arm/plat-omap/mmu.c	diff1 \|	\|	blob \| history
arch/arm/plat-omap/timer32k.c	diff1 \|	diff2 \|	blob \| history
arch/arm/vfp/vfphw.S	diff1 \|	diff2 \|	blob \| history
arch/arm/vfp/vfpmodule.c	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/char/watchdog/omap_wdt.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/leds/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/leds/leds-omap-pwm.c	diff1 \|	\|	blob \| history
drivers/media/radio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/serial/8250.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/spi/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/omap_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/g_ep0.c	diff1 \|	\|	blob \| history
drivers/usb/musb/musb_gadget.c	diff1 \|	\|	blob \| history
drivers/video/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/omap/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/omap/rfbi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap/sossi.c	diff1 \|	diff2 \|	blob \| history
include/asm-arm/pgtable.h	diff1 \|	diff2 \|	blob \| history
include/asm-arm/thread_info.h	diff1 \|	diff2 \|	blob \| history
include/asm-arm/vfp.h	diff1 \|	diff2 \|	blob \| history
include/linux/i2c-id.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/oss/Makefile	diff1 \|	diff2 \|	blob \| history