From: Linus Torvalds Date: Mon, 10 Oct 2011 02:39:03 +0000 (+1200) Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus X-Git-Tag: v3.1-rc10~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a24d025a08c90355bd39e95a34dbc4c806ff1d25;p=profile%2Fcommon%2Fkernel-common.git Merge branch 'upstream' of git://git.linux-mips.org/upstream-linus * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (29 commits) MIPS: Call oops_enter, oops_exit in die staging/octeon: Software should check the checksum of no tcp/udp packets MIPS: Octeon: Enable C0_UserLocal probing. MIPS: No branches in delay slots for huge pages in handle_tlbl MIPS: Don't clobber CP0_STATUS value for CONFIG_MIPS_MT_SMTC MIPS: Octeon: Select CONFIG_HOLES_IN_ZONE MIPS: PM: Use struct syscore_ops instead of sysdevs for PM (v2) MIPS: Compat: Use 32-bit wrapper for compat_sys_futex. MIPS: Do not use EXTRA_CFLAGS MIPS: Alchemy: DB1200: Disable cascade IRQ in handler SERIAL: Lantiq: Set timeout in uart_port MIPS: Lantiq: Fix setting the PCI bus speed on AR9 MIPS: Lantiq: Fix external interrupt sources MIPS: tlbex: Fix build error in R3000 code. MIPS: Alchemy: Include Au1100 in PM code. MIPS: Alchemy: Fix typo in MAC0 registration MIPS: MSP71xx: Fix build error. MIPS: Handle __put_user() sleeping. MIPS: Allow forced irq threading MIPS: i8259: Mark cascade interrupt non-threaded ... --- a24d025a08c90355bd39e95a34dbc4c806ff1d25