tree 278469aac24db3d6cc8da8e2a4188fd20c253d55
parent e25bda564299e431200d1e0e1a229679f45437aa
parent e6f4dee7a8bf4f23db088a9e1c6a0baa619e606d
author Linus Torvalds <torvalds@linux-foundation.org> 1330358373 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1330358373 -0800

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.