Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 26 Feb 2008 16:17:36 +0000 (08:17 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 26 Feb 2008 16:17:36 +0000 (08:17 -0800)
commitcb9069e5930e67e898505a7bf9b82f0c9d57ce38
tree8e8783db14c9a444a8dd43a2ddee549c47fae9c4
parente26fbf290bcc5793ed1d8933de5bcf5d09e5e6d8
parentbfa274e2436fc7ef72ef51c878083647f1cfd429
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
MAINTAINERS
Makefile
arch/arm/mach-omap1/board-sx1.c
drivers/hwmon/Kconfig
drivers/hwmon/Makefile
drivers/usb/host/Kconfig
drivers/usb/host/ehci-hcd.c