Merge tag 'tiny/no-advice-fixup-3.18' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Oct 2014 13:21:57 +0000 (09:21 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Oct 2014 13:21:57 +0000 (09:21 -0400)
commitce254b34da41b121c6d781fea8940090c0107a20
tree4192d8921bef7513af7714cfe02f11ad6bf2cc76
parent47e0de1a74505537788dad41a55a7bdc224462b9
parent887e7019e3b8f00c7901c0bc66fb689ced69f7b4
Merge tag 'tiny/no-advice-fixup-3.18' of git://git./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
mm/Makefile