From: Steve French <sfrench@us.ibm.com>
Date: Tue, 6 May 2008 17:55:32 +0000 (+0000)
Subject: Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.26-rc2~13^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a815752ac0ffdb910e92958d41d28f4fb28e5296;p=linux-2.6

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

a815752ac0ffdb910e92958d41d28f4fb28e5296