From: Steve French <sfrench@us.ibm.com>
Date: Thu, 17 Apr 2008 23:38:45 +0000 (+0000)
Subject: Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.26-rc1~1079^2~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20e673810c69d18bee2ed74d19af3806ec2504f5;p=linux-2.6

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

20e673810c69d18bee2ed74d19af3806ec2504f5