Merge branch 'linus' into timers/urgent
authorThomas Gleixner <tglx@linutronix.de>
Fri, 12 Jul 2013 10:34:42 +0000 (12:34 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 12 Jul 2013 10:34:42 +0000 (12:34 +0200)
commitf2006e27396f55276f24434f56e208d86e7f9908
tree71896db916d33888b4286f80117d3cac0da40e6d
parente399eb56a6110e13f97e644658648602e2b08de7
parent9903883f1dd6e86f286b7bfa6e4b423f98c1cd9e
Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/sysctl.c