From: Tony Luck <tony.luck@intel.com>
Date: Fri, 8 Jul 2005 15:52:42 +0000 (-0700)
Subject: Auto merge with /home/aegl/GIT/linus
X-Git-Tag: v2.6.13-rc3~90^2~5
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=88c3cdfdde3cf87e1831265ea4246430bef34fc9;p=safe%2Fjmp%2Flinux-2.6

Auto merge with /home/aegl/GIT/linus
---

88c3cdfdde3cf87e1831265ea4246430bef34fc9