From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 8 Mar 2008 16:49:24 +0000 (-0500)
Subject: Merge commit 'origin' into devel
X-Git-Tag: v2.6.26-rc1~1082^2^2~64
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9446389ef612096704fdf18fa79bab423d4110f0;p=linux-2.6

Merge commit 'origin' into devel
---

9446389ef612096704fdf18fa79bab423d4110f0