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)
Get upstream changes so we can apply fixes against them

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

diff --cc kernel/sysctl.c
Simple merge