summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-05 14:27:34 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-05 14:27:34 -0800
commit3a81a6e7802947b4e8b259353767f7b0d2701b1d (patch)
tree79fc0e645d252a9963bd5f81d99d9c096629255b /include
parentcd2934a3b3057eb048f8b4fb82e941d24a043207 (diff)
parentf232c7e8294372f8c2bee719b1593f3fa7fa9cfa (diff)
downloadlinux-3a81a6e7802947b4e8b259353767f7b0d2701b1d.tar.gz
linux-3a81a6e7802947b4e8b259353767f7b0d2701b1d.tar.bz2
linux-3a81a6e7802947b4e8b259353767f7b0d2701b1d.zip
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle: "What's in there: a number of MIPS fixes and touchups. The most important change in this pull request is Kautuk Consul's port of changes to do_page_fault which fix a hang that affects some configurations. Still not quite ready for a release, there are problems with 64-bit platforms." * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: traps.c: Fix typo MIPS: PowerTV: Fix defconfigs for coverage builds MIPS: Netlogic: Fix defconfigs for coverage builds MIPS: ATH79: Avoid a kernel bug on AR913X MIPS: PCI: use list_for_each_entry() for bus->devices traversal MIPS: fault.c: Port OOM changes to do_page_fault MIPS: vmlinux.lds.S: remove duplicate _sdata symbol MIPS: Alchemy: Increase minimum timeout for 32kHz timer. MIPS: txx9 7segled fix struct device has no member MIPS: Alchemy: Update Au1300 inlined GPIO macros MIPS: Remove temporary kludge from <asm/page.h> MIPS: BMIPS: smp-bmips.c does not need to include version.h
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions