From: Steve French <sfrench@us.ibm.com>
Date: Wed, 1 Feb 2006 20:16:53 +0000 (-0800)
Subject: Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: v2.6.16-rc2~1^2~10^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6da74e1f20ea7822e52a9e4fbd3d25bd907e471;p=linux-2.6

Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>
---

e6da74e1f20ea7822e52a9e4fbd3d25bd907e471