From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 16 Jul 2005 18:47:51 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
X-Git-Tag: v2.6.13-rc4~89
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=af6ea9ca23504fe620412826a420dca9c43a8bf6;p=~emulex%2Finfiniband.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
---

af6ea9ca23504fe620412826a420dca9c43a8bf6