]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab22c17 edc805b)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Sep 2010 19:51:22 +0000 (12:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Sep 2010 19:51:22 +0000 (12:51 -0700)
* '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


Trivial merge
Clone of davem's net-next-2.6 tree