From: Tony Luck <tony.luck@intel.com>
Date: Mon, 6 Jun 2005 22:42:07 +0000 (-0700)
Subject: auto merge with /home/aegl/GIT/linus
X-Git-Tag: v2.6.12~67^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=26abd53d8e9e51bbeea0b4772e8dffece3eeff38;p=users%2Fjedix%2Flinux-maple.git

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

26abd53d8e9e51bbeea0b4772e8dffece3eeff38