From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 18 Nov 2005 16:42:40 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.17-rc1~1182^2~130^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=85a07029aaba8f5b27241bcff56cc009c9f4993b;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream'
---

85a07029aaba8f5b27241bcff56cc009c9f4993b