summaryrefslogtreecommitdiff
path: root/fs/proc
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-01-06 23:15:54 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-06 23:15:54 -0500
commitece2ccb668046610189d88d6aaf05aeb09c988a1 (patch)
treea0349945f7537de2aca420b47ced23b6294f8b65 /fs/proc
parentd10577a8d86a0c735488d66d32289a6d66bcfa20 (diff)
parenta218d0fdc5f9004164ff151d274487f6799907d0 (diff)
parentff01bb4832651c6d25ac509a06a10fcbd75c461c (diff)
downloadlinux-3.10-ece2ccb668046610189d88d6aaf05aeb09c988a1.tar.gz
linux-3.10-ece2ccb668046610189d88d6aaf05aeb09c988a1.tar.bz2
linux-3.10-ece2ccb668046610189d88d6aaf05aeb09c988a1.zip
Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z