From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 30 Jan 2006 22:43:25 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~64^2~28
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=747af1e154545566d04f647f86fc3ae512439fab;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-fixes'
---

747af1e154545566d04f647f86fc3ae512439fab