Pull misc-for-upstream into release branch
commit81450b73dde07f473a4a7208b209b4c8b7251d90
authorLen Brown <len.brown@intel.com>
Fri, 16 Feb 2007 23:52:41 +0000 (16 18:52 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 16 Feb 2007 23:52:41 +0000 (16 18:52 -0500)
tree94e676c74c32f2a74dc306cf863d7e190777f2ab
parent8a03d9a498eaf02c8a118752050a5154852c13bf
parent0539771d7236b425f285652f6f297cc7939c8f9a
Pull misc-for-upstream into release branch

Conflicts:

drivers/usb/misc/appledisplay.c

Signed-off-by: Len Brown <len.brown@intel.com>
MAINTAINERS
drivers/acpi/processor_idle.c
drivers/acpi/thermal.c
drivers/usb/misc/appledisplay.c