tree 4192d8921bef7513af7714cfe02f11ad6bf2cc76
parent 47e0de1a74505537788dad41a55a7bdc224462b9
parent 887e7019e3b8f00c7901c0bc66fb689ced69f7b4
author Linus Torvalds <torvalds@linux-foundation.org> 1413120117 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1413120117 -0400
mergetag object 887e7019e3b8f00c7901c0bc66fb689ced69f7b4
 type commit
 tag tiny/no-advice-fixup-3.18
 tagger Josh Triplett <josh@joshtriplett.org> 1412972604 -0700
 
 Fixup for 3.18: use PATCHv2 of "mm: Support compiling out madvise and fadvise"
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlQ4QE8ACgkQGJuZRtD+evvV7wCgta2s0uREeOpfj5ulXhDCRk1u
 MpYAnRR8yscDvZa12v7oTtxMOCqbJPjh
 =NIl9
 -----END PGP SIGNATURE-----

Merge tag 'tiny/no-advice-fixup-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux

Pull tinification fix from Josh "Paper Bag" Triplett:
 "Fixup to use PATCHv2 of 'mm: Support compiling out madvise and
  fadvise'"

* tag 'tiny/no-advice-fixup-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux:
  mm: Support fadvise without CONFIG_MMU