From: Dave Airlie <airlied@starflyer.(none)>
Date: Sun, 25 Sep 2005 03:14:45 +0000 (+1000)
Subject: update from upstream
X-Git-Tag: v2.6.15-rc1~18^2~14^2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4e0c1159d83a658d1ffba5bc3442f4ec4cadb436;p=users%2Fjedix%2Flinux-maple.git

update from upstream
---

4e0c1159d83a658d1ffba5bc3442f4ec4cadb436