projects / linux-drm-fsl-dcu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9befb55 b6349ac)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Apr 2010 19:31:12 +0000 (12:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Apr 2010 19:31:12 +0000 (12:31 -0700)
commit255f41c59558a346d65a2012420a7573e36dc584
treea802e21e60c7e342ad72319853b64e214091b6a9tree | snapshot
parent9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0commit | diff
parentb6349ac89eacb813f6963f7263da05bc3f483351commit | diff
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
fs/logfs/gc.c diff1 | diff2 | blob | history
fs/logfs/journal.c diff1 | diff2 | blob | history
fs/logfs/readwrite.c diff1 | diff2 | blob | history
fs/logfs/segment.c diff1 | diff2 | blob | history
fs/logfs/super.c diff1 | diff2 | blob | history
Freescale DCU DRM driver