summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-04 12:36:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-04 12:36:54 -0800
commitc5974b835a909ff15c3b7e6cf6789b5eb919f419 (patch)
tree959088bbf10da0d8496b1310fd6f3be6ea11966e /fs
parent14107c750b840d6efd7fdf2f6d513f35e2eb6230 (diff)
parent3e10e716abf3c71bdb5d86b8f507f9e72236c9cd (diff)
downloadlinux-3.10-c5974b835a909ff15c3b7e6cf6789b5eb919f419.tar.gz
linux-3.10-c5974b835a909ff15c3b7e6cf6789b5eb919f419.tar.bz2
linux-3.10-c5974b835a909ff15c3b7e6cf6789b5eb919f419.zip
Merge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux
* 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux: resource: add helpers for fetching rlimits resource: move kernel function inside __KERNEL__ SECURITY: selinux, fix update_rlimit_cpu parameter
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions