projects / platform / kernel / linux-stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14107c7 3e10e71)
Merge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jan 2010 20:36:54 +0000 (12:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jan 2010 20:36:54 +0000 (12:36 -0800)
* '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


Trivial merge
Domain: System / Kernel;