tree 94e676c74c32f2a74dc306cf863d7e190777f2ab
parent 8a03d9a498eaf02c8a118752050a5154852c13bf
parent 0539771d7236b425f285652f6f297cc7939c8f9a
author Len Brown <len.brown@intel.com> 1171669961 -0500
committer Len Brown <len.brown@intel.com> 1171669961 -0500

Pull misc-for-upstream into release branch

Conflicts:

	drivers/usb/misc/appledisplay.c

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