Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  HOWTO: update misspelling and word incorrected
  add stable_api_nonsense.txt in korean
  HOWTO: change addresses of maintainer and lxr url for Korean HOWTO
  Add Documentation for FAIR_USER_SCHED sysfs files
  HOWTO: Change man-page maintainer address for Japanese HOWTO
  tipar: remove obsolete module
  kobject: fix the documentation of how kobject_set_name works

1 files changed, 14 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-kernel-uids b/Documentation/ABI/testing/sysfs-kernel-uids
new file mode 100644
index 000000000000..648d65dbc0e7
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-kernel-uids
@@ -0,0 +1,14 @@
+What:           /sys/kernel/uids/<uid>/cpu_shares
+Date:           December 2007
+Contact:        Dhaval Giani <dhaval@linux.vnet.ibm.com>
+                Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
+Description:
+                The /sys/kernel/uids/<uid>/cpu_shares tunable is used
+                to set the cpu bandwidth a user is allowed. This is a
+                propotional value. What that means is that if there
+                are two users logged in, each with an equal number of
+                shares, then they will get equal CPU bandwidth. Another
+                example would be, if User A has shares = 1024 and user
+                B has shares = 2048, User B will get twice the CPU
+                bandwidth user A will. For more details refer
+                Documentation/sched-design-CFS.txt