diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-07 08:15:54 +0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-07 08:15:54 +0400 |
commit | ece2ccb668046610189d88d6aaf05aeb09c988a1 (patch) | |
tree | a0349945f7537de2aca420b47ced23b6294f8b65 /fs/notify/fanotify/fanotify_user.c | |
parent | d10577a8d86a0c735488d66d32289a6d66bcfa20 (diff) | |
parent | a218d0fdc5f9004164ff151d274487f6799907d0 (diff) | |
parent | ff01bb4832651c6d25ac509a06a10fcbd75c461c (diff) | |
download | linux-ece2ccb668046610189d88d6aaf05aeb09c988a1.tar.xz |
Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z