From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Feb 2012 15:59:33 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs
X-Git-Tag: v3.3-rc6~28
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5ffca28a4ac7abb8a254fafe6bd03b2f83667df7;p=~emulex%2Finfiniband.git

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

Here are some trivial NTFS changes (a spelling fix and two use before
NULL check cases found by Coverity as well as an update in MAINTAINERS
for the path to the ntfs git repo) together with a simple LDM fix for
parsing fragmented VBLKs.

* git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs:
  NTFS: Update git repo path in MAINTAINERS file.
  LDM: Fix reassembly of extended VBLKs.
  NTFS: Correct two spelling errors "dealocate" to "deallocate" in mft.c.
  NTFS: Do not dereference pointer before checking for NULL.
  NTFS: Remove unused variable.
---

5ffca28a4ac7abb8a254fafe6bd03b2f83667df7