aboutsummaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-31 11:38:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-31 11:38:38 -0700
commit75eaff010547c55256f807700277365ee07d2a58 (patch)
treeccae772c0e3a20e3b52156786bed8ea8d350f4ba /kernel/sysctl.c
parentf66d95d69db3a329354bf29ebe5fc73862d2c60a (diff)
parentff5fadaff39180dc0b652753b5614a564711be29 (diff)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle: - BMIPS SMP fixes - a build fix necessary for older compilers - two more bugs found my Chandras' testing - and one more build fix * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: BMIPS: fix slave CPU booting when physical CPU is not 0 MIPS: BMIPS: do not change interrupt routing depending on boot CPU MIPS: powertv: Fix arguments for free_reserved_area() MIPS: Set default CPU type for BCM47XX platforms MIPS: uapi/asm/siginfo.h: Fix GCC 4.1.2 compilation MIPS: Fix multiple definitions of UNCAC_BASE.
Diffstat (limited to 'kernel/sysctl.c')
0 files changed, 0 insertions, 0 deletions