From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 4 Aug 2006 18:24:15 +0000 (-0400)
Subject: Merge branch 'from-linus' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~88^2~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=71bfe47f023c55c322607939b786ce0a44627dfc;p=linux-2.6-omap-h63xx.git

Merge branch 'from-linus' into upstream
---

71bfe47f023c55c322607939b786ce0a44627dfc