]> err.no Git - linux-2.6/commitdiff
Merge branch 'pnp-fix' into release-2.6.27
authorAndi Kleen <ak@linux.intel.com>
Mon, 25 Aug 2008 10:05:02 +0000 (12:05 +0200)
committerAndi Kleen <ak@linux.intel.com>
Mon, 25 Aug 2008 10:05:02 +0000 (12:05 +0200)

Trivial merge