| commit | 1d91686a475381443a5e00ff3a6ab1ee61d6af28 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 13 12:51:22 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 13 12:51:22 2010 -0700 |
| tree | 19e4e114196b9a2df0b452a2c21449ae19674584 | |
| parent | ab22c17cd2a9840b4457a656fd377c73ec4f518d [diff] | |
| parent | edc805b7c5e45c3d7202cea5239985d204178e24 [diff] |
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