| commit | c5974b835a909ff15c3b7e6cf6789b5eb919f419 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 04 12:36:54 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 04 12:36:54 2010 -0800 |
| tree | 959088bbf10da0d8496b1310fd6f3be6ea11966e | |
| parent | 14107c750b840d6efd7fdf2f6d513f35e2eb6230 [diff] | |
| parent | 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd [diff] |
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