tree 959088bbf10da0d8496b1310fd6f3be6ea11966e
parent 14107c750b840d6efd7fdf2f6d513f35e2eb6230
parent 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd
author Linus Torvalds <torvalds@linux-foundation.org> 1262637414 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262637414 -0800

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