From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 18 Oct 2005 20:50:52 +0000 (-0700)
Subject: Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.15-rc1~733^2~55^2~20
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cff6bf970965c98c62007fc8a36527fd147fe233;p=linux-2.6-omap-h63xx.git

Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
---

cff6bf970965c98c62007fc8a36527fd147fe233