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

drivers/usb/misc/appledisplay.c

Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge