| commit | 1853a65ec5bd07c18f4a43e6709486c81400afa6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 06 13:14:43 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 06 13:14:43 2013 -0700 |
| tree | 8440212e24ed680d655f0aca2b2dfc703875798c | |
| parent | 69b4a3a030df04e0b8961070fc33da6a5c0a19bb [diff] | |
| parent | fcfa66de8a2f0631a65a2cec0f6149dafd36ec81 [diff] |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus Pull MIPS fixes from Ralf Baechle: "Two platform-specific fixes plus a fix for oprofile which was calling smp_processor_id() in preemptible code" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: BMIPS: fix hardware interrupt routing for boot CPU != 0 MIPS: oprofile: Fix BUG due to smp_processor_id() in preemptible code. MIPS: PNX833x: PNX8335_PCI_ETHERNET_INT depends on CONFIG_SOC_PNX8335