From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Sep 2010 19:51:22 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: v2.6.36-rc5~39
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=1d91686a475381443a5e00ff3a6ab1ee61d6af28;p=net-next-2.6.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k,m68knommu: Wire up fanotify_init, fanotify_mark, and prlimit64
---

1d91686a475381443a5e00ff3a6ab1ee61d6af28