diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-06 22:14:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-06 22:14:43 +0200 |
| commit | 1853a65ec5bd07c18f4a43e6709486c81400afa6 (patch) | |
| tree | 8440212e24ed680d655f0aca2b2dfc703875798c /kernel/trace | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
| parent | MIPS: BMIPS: fix hardware interrupt routing for boot CPU != 0 (diff) | |
| download | linux-1853a65ec5bd07c18f4a43e6709486c81400afa6.tar.xz linux-1853a65ec5bd07c18f4a43e6709486c81400afa6.zip | |
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
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions