www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

arch/arm/Kconfig
arch/arm/configs/omap3_pandora_defconfig
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-innovator.c
arch/arm/mach-omap1/board-osk.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-generic.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/mux.c
arch/arm/plat-omap/devices.c
arch/arm/plat-omap/include/mach/control.h
arch/arm/plat-omap/include/mach/mux.h
drivers/i2c/busses/i2c-omap.c
drivers/i2c/chips/Kconfig
drivers/i2c/chips/Makefile
drivers/i2c/chips/menelaus.c
drivers/input/keyboard/gpio_keys.c
drivers/input/touchscreen/Makefile
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mtd/onenand/omap2.c
drivers/usb/gadget/Kconfig
drivers/usb/musb/musbhsdma.h
drivers/usb/otg/Kconfig
include/linux/i2c/twl4030.h
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/codecs/twl4030.c
sound/soc/codecs/twl4030.h
sound/soc/omap/Kconfig
sound/soc/omap/Makefile
sound/soc/omap/omap3beagle.c
sound/soc/omap/overo.c

author	Tony Lindgren <tony@atomide.com>
	Thu, 15 Jan 2009 15:25:27 +0000 (17:25 +0200)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 15 Jan 2009 15:25:27 +0000 (17:25 +0200)
commit	cb4befa920199d2537f4a3b01405e8ae3c9b20c7
tree	9af00c60382835cf7198477d8309cf91a6846884	tree \| snapshot
parent	15f75b6226c2d3b82062bb721e7cb9a1d6f35efd	commit \| diff
parent	c59765042f53a79a7a65585042ff463b69cb248c	commit \| diff

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/setup.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/mcbsp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/mcbsp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/timer-gp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/dma.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/mcbsp.h	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/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/ads7846.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl4030-core.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	\|	blob \| history
drivers/mtd/maps/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/omap_nor.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/smc911x.h	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/power/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/power/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/rtc/rtc-twl4030.c	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/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/watchdog/Kconfig	diff1 \|	diff2 \|	blob \| history
include/linux/i2c/twl4030.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
security/Kconfig	diff1 \|	diff2 \|	blob \| history