From: David Woodhouse <David.Woodhouse@intel.com>
Date: Fri, 11 Jul 2008 13:36:25 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.27-rc1~69^2~27
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8931ef380c92d121ae74ecfb03b2d63f72eea6f;p=linux-2.6

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
---

a8931ef380c92d121ae74ecfb03b2d63f72eea6f