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/Kconfig
arch/arm/boot/compressed/Makefile
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-mmc.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/pm.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/timer-gp.c
arch/arm/plat-omap/Makefile
arch/arm/plat-omap/gpio.c
arch/arm/tools/mach-types
arch/arm/vfp/vfphw.S
arch/arm/vfp/vfpmodule.c
drivers/crypto/Kconfig
drivers/crypto/Makefile
drivers/hwmon/Makefile
drivers/i2c/chips/Kconfig
drivers/input/keyboard/Makefile
drivers/mmc/host/omap.c
drivers/net/irda/Makefile
drivers/net/smc91x.h
drivers/usb/Kconfig
drivers/video/backlight/Makefile
drivers/w1/masters/Kconfig
drivers/w1/masters/Makefile
include/asm-arm/arch-omap/board-h3.h
include/asm-arm/arch-omap/common.h
include/asm-arm/arch-omap/dma.h
include/asm-arm/arch-omap/gpio.h
include/asm-arm/arch-omap/irqs.h
include/asm-arm/fpstate.h
include/asm-arm/vfp.h
include/asm-arm/vfpmacros.h
kernel/printk.c
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/Makefile
security/Kconfig

author	Tony Lindgren <tony@atomide.com>
	Tue, 12 Feb 2008 21:19:22 +0000 (13:19 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 12 Feb 2008 21:19:22 +0000 (13:19 -0800)
commit	ccc4e1d8ddc4005fefbfb79d0482ce49b21ba884
tree	007a75b6a3b202e39906d437b1ce1790707dc590	tree \| snapshot
parent	89a1fcb575ac8713a83204504c7e613a097680d7	commit \| diff
parent	cc13e442952a347f7e217eeaee4778485394f1be	commit \| diff

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
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/boot/compressed/head.S	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/entry-common.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-2430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-apollon.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/gpio.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/mailbox.c	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/char/hw_random/omap-rng.c	diff1 \|	diff2 \|	blob \| history
drivers/crypto/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/crypto/Makefile	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/i2c/busses/i2c-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/isp1301_omap.c	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/ads7846.c	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/radio/Makefile	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/cmdlinepart.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Makefile	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/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/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/w1/masters/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/w1/masters/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/watchdog/Kconfig	diff1 \|	diff2 \|	blob \| history
include/asm-arm/arch-omap/dma.h	diff1 \|	diff2 \|	blob \| history
include/asm-arm/arch-omap/omap-alsa.h	diff1 \|	diff2 \|	blob \| history
include/linux/connector.h	diff1 \|	diff2 \|	blob \| history
include/linux/i2c-id.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/Kconfig	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/Makefile	diff1 \|	diff2 \|	blob \| history
security/Kconfig	diff1 \|	diff2 \|	blob \| history
security/Makefile	diff1 \|	diff2 \|	blob \| history
sound/oss/Makefile	diff1 \|	diff2 \|	blob \| history