From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Mar 2012 00:14:55 +0000 (-0700)
Subject: Merge branch 'akpm' (more patches from Andrew)
X-Git-Tag: v3.3~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cb1ecf25a84aec8c9d1fc6ad0c78adf4fd8335de;p=linux.git

Merge branch 'akpm' (more patches from Andrew)

Merge some more email patches from Andrew Morton:
 "A couple of nilfs fixes"

* emailed from Andrew Morton <akpm@linux-foundation.org>:
  nilfs2: fix NULL pointer dereference in nilfs_load_super_block()
  nilfs2: clamp ns_r_segments_percentage to [1, 99]
---

cb1ecf25a84aec8c9d1fc6ad0c78adf4fd8335de