From: Tony Luck <tony.luck@intel.com>
Date: Tue, 28 Jun 2005 15:24:49 +0000 (-0700)
Subject: Auto merge with /home/aegl/GIT/ia64-test
X-Git-Tag: v2.6.13-rc2~59^2~14
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54522b6613a03807f057fd567794a31267ef85cb;p=linux-2.6

Auto merge with /home/aegl/GIT/ia64-test
---

54522b6613a03807f057fd567794a31267ef85cb