Merge commit 'v2.6.34-rc7' into perf/nmi
[pandora-kernel.git] / kernel / sysctl.c
diff --cc kernel/sysctl.c
Simple merge