From: Tony Lindgren <tony@atomide.com>
Date: Fri, 3 Oct 2008 13:19:58 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.27-omap1~96
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=708244b3f3d5dad958059729c384a068ecd46161;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/usb/musb/musb_core.c
---

708244b3f3d5dad958059729c384a068ecd46161