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

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-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-nokia770.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.c
arch/arm/mach-omap2/board-h4.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/nwfpe/entry.S
arch/arm/plat-omap/Makefile
drivers/char/watchdog/omap_wdt.c
drivers/char/watchdog/omap_wdt.h
drivers/i2c/busses/i2c-omap.c
drivers/i2c/chips/menelaus.c
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/media/video/Kconfig
drivers/media/video/Makefile
drivers/media/video/tcm825x.c
drivers/media/video/v4l2-int-device.c
drivers/mtd/onenand/onenand_base.c
drivers/usb/gadget/Kconfig
drivers/video/Makefile
include/asm-arm/arch-omap/board-2430sdp.h
include/asm-arm/arch-omap/hardware.h
include/asm-arm/arch-omap/io.h
include/asm-arm/arch-omap/omap24xx.h
include/linux/connector.h

author	Tony Lindgren <tony@atomide.com>
	Mon, 29 Oct 2007 11:50:40 +0000 (04:50 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Mon, 29 Oct 2007 11:50:40 +0000 (04:50 -0700)
commit	19ea3371abfff6bbfa8ef72b50aba042fd26be6b
tree	72e8ac47040bda13540eed8d5b410469cab14027	tree \| snapshot
parent	266b0072e043ab81e19e5595e95f557fb43a3cb5	commit \| diff
parent	0b776eb5426752d4e53354ac89e3710d857e09a7	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/mach-omap1/board-osk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/pm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/timer-gp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/cpu-omap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/dma.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/gpio.c	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/char/hw_random/omap-rng.c	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/omap-keypad.c	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/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/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/onenand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/onenand/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/onenand/onenand_base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.h	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/omap_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/omap/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/omap/rfbi.c	diff1 \|	diff2 \|	blob \| history
include/linux/i2c-id.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
security/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/oss/Makefile	diff1 \|	diff2 \|	blob \| history