From: Nathan Scott <nathans@bruce>
Date: Thu, 12 Jan 2006 02:34:47 +0000 (+1100)
Subject: Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=ddae9c2ea79449beb00027cf77fca6dc489f2d15;p=linux-edison.git

Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
---

ddae9c2ea79449beb00027cf77fca6dc489f2d15