Merge branch 'wan' into release-2.6.27
authorAndi Kleen <ak@linux.intel.com>
Thu, 28 Aug 2008 17:25:21 +0000 (19:25 +0200)
committerAndi Kleen <ak@linux.intel.com>
Thu, 28 Aug 2008 17:25:21 +0000 (19:25 +0200)

Trivial merge