Merge mainline v2.6.27-rc2 tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 11 Aug 2008 14:16:24 +0000 (17:16 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 11 Aug 2008 14:16:24 +0000 (17:16 +0300)
commit5061bcd119547453b32c847d2b9490a052bc1755
tree3514707703aa7c2a12afa88532ca4c161d641c41
parentd6daf8d8cc5ccf90247def5551ee9c3e8555e848
parent0967d61ea0d8e8a7826bd8949cd93dd1e829ac55
Merge mainline v2.6.27-rc2 tree into linux-omap tree

Merge branch 'master'; commit 'linus'

Conflicts:

arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/mcbsp.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/clock.h
arch/arm/mach-omap2/clock24xx.c
arch/arm/mach-omap2/clock24xx.h
arch/arm/mach-omap2/clock34xx.c
arch/arm/mach-omap2/clock34xx.h
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/mcbsp.c
arch/arm/mach-omap2/memory.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/prm.h
arch/arm/mach-omap2/sram242x.S
arch/arm/mach-omap2/sram243x.S
arch/arm/plat-omap/common.c
arch/arm/plat-omap/devices.c
arch/arm/plat-omap/mcbsp.c
arch/arm/plat-omap/sram.c
drivers/i2c/busses/Kconfig
drivers/i2c/chips/isp1301_omap.c
drivers/input/touchscreen/Kconfig
drivers/misc/Makefile
drivers/mtd/nand/Makefile
drivers/net/Kconfig
drivers/net/smc911x.h
drivers/power/Kconfig
drivers/power/Makefile
drivers/usb/gadget/omap_udc.c
include/asm-arm/arch-omap/board-2430sdp.h
include/asm-arm/arch-omap/board.h
include/asm-arm/arch-omap/clock.h
include/asm-arm/arch-omap/common.h
include/asm-arm/arch-omap/hardware.h
include/asm-arm/arch-omap/io.h
include/asm-arm/arch-omap/mcbsp.h
include/asm-arm/arch-omap/omap34xx.h
include/asm-arm/arch-omap/sram.h
include/asm-arm/cpu-multi32.h
include/asm-arm/pgtable.h
include/asm-arm/setup.h
include/linux/i2c-id.h
kernel/printk.c
security/Makefile
sound/arm/Kconfig
71 files changed:
MAINTAINERS
Makefile
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/Makefile
arch/arm/boot/compressed/head.S
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/setup.h
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap2/board-n800.c
arch/arm/mm/Kconfig
arch/arm/plat-omap/gpio-switch.c
drivers/Makefile
drivers/bluetooth/Kconfig
drivers/bluetooth/brf6150.c
drivers/cbus/retu.c
drivers/cbus/tahvo.c
drivers/crypto/Kconfig
drivers/crypto/Makefile
drivers/dsp/dspgateway/task.c
drivers/hwmon/Kconfig
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile
drivers/i2c/chips/Kconfig
drivers/i2c/chips/Makefile
drivers/i2c/chips/twl4030-core.c
drivers/input/keyboard/tsc2301_kp.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/input/touchscreen/ads7846.c
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/media/video/Kconfig
drivers/media/video/Makefile
drivers/media/video/omap24xxcam.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/host/Kconfig
drivers/mmc/host/Makefile
drivers/mtd/cmdlinepart.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
drivers/mtd/onenand/omap2.c
drivers/net/Kconfig
drivers/net/smc911x.h
drivers/net/smc91x.c
drivers/power/Kconfig
drivers/power/Makefile
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/serial/8250.c
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/usb/gadget/Kconfig
drivers/usb/gadget/omap_udc.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ohci-omap.c
drivers/video/backlight/Kconfig
drivers/video/omap/dispc.c
drivers/video/omap/omapfb_main.c
drivers/video/omap/sossi.c
drivers/watchdog/Kconfig
include/linux/connector.h
kernel/printk.c
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/Makefile
security/Kconfig
security/Makefile
sound/arm/Kconfig
sound/oss/Makefile