From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jan 2010 20:36:54 +0000 (-0800)
Subject: Merge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux
X-Git-Tag: v2.6.33-rc3~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5974b835a909ff15c3b7e6cf6789b5eb919f419;p=platform%2Fkernel%2Flinux-3.10.git

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
---

c5974b835a909ff15c3b7e6cf6789b5eb919f419