From: Tony Lindgren <tony@atomide.com>
Date: Tue, 12 Feb 2008 21:19:22 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.25-omap1~200
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccc4e1d8ddc4005fefbfb79d0482ce49b21ba884;p=pandora-kernel.git

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
---

ccc4e1d8ddc4005fefbfb79d0482ce49b21ba884
Reading git-diff-tree failed