Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 27 May 2008 19:52:26 +0000 (12:52 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 27 May 2008 19:52:26 +0000 (12:52 -0700)
commit61acc9535af017fa98ce33ecda025251a99a2d48
tree5a968512579d1128373e6c19943919691442aff7
parentcc7f51d0235e024daabc24af54de85d4543940a4
parente490517a039a99d692cb3a5561941b0a5f576172
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

arch/arm/plat-omap/clock.c
include/asm-arm/arch-omap/clock.h
16 files changed:
MAINTAINERS
Makefile
arch/arm/mach-omap1/board-palmte.c
arch/arm/plat-omap/clock.c
drivers/hwmon/Kconfig
drivers/hwmon/Makefile
drivers/i2c/chips/twl4030-usb.c
drivers/media/video/Kconfig
drivers/mmc/host/Kconfig
drivers/net/Kconfig
drivers/serial/8250.c
drivers/watchdog/Kconfig
include/asm-arm/arch-omap/clock.h
include/asm-arm/arch-omap/entry-macro.S
include/asm-arm/arch-omap/gpio.h
include/asm-arm/arch-omap/hardware.h