From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Apr 2010 19:31:12 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
X-Git-Tag: v2.6.34-rc6~76
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=255f41c59558a346d65a2012420a7573e36dc584;p=pandora-kernel.git

Merge git://git./linux/kernel/git/joern/logfs

* git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
  [LogFS] Split large truncated into smaller chunks
  [LogFS] Set s_bdi
  [LogFS] Prevent mempool_destroy NULL pointer dereference
  [LogFS] Move assertion
  [LogFS] Plug 8 byte information leak
  [LogFS] Prevent memory corruption on large deletes
  [LogFS] Remove unused method

Fix trivial conflict with added header includes in fs/logfs/super.c
---

255f41c59558a346d65a2012420a7573e36dc584
Reading git-diff-tree failed