Merge branch 'akpm' (more patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Mar 2012 00:14:55 +0000 (17:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Mar 2012 00:14:55 +0000 (17:14 -0700)
commitcb1ecf25a84aec8c9d1fc6ad0c78adf4fd8335de
tree8c466871a54837c7b64c0a10bf6afe498bdafddc
parent33e9ee8dbd0c564533e9ac0e1a0c00e073d5b5c0
parentd7178c79d9b7c5518f9943188091a75fc6ce0675
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]