diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-20 10:57:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-20 10:57:52 -0700 |
| commit | 3fb725c48b93c0a152174b6dbbc1029b5e734c7b (patch) | |
| tree | 5cac1bb6a6aaecedc237bc1ef89e0d374d6f08c8 /include/linux/rmap.h | |
| parent | Merge tag 'sound-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
| parent | MIPS: Make local_irq_disable macro safe for non-Mipsr2 (diff) | |
| download | linux-dev-3fb725c48b93c0a152174b6dbbc1029b5e734c7b.tar.xz linux-dev-3fb725c48b93c0a152174b6dbbc1029b5e734c7b.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"Another set of five fixes. The most interesting one is a fix for race
condition in the local_irq_disable() implementation used by .S code
for pre-MIPS R2 processors only. It leaves a race that's hard but not
impossible to hit; the others fairly obvious"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Make local_irq_disable macro safe for non-Mipsr2
MIPS: Octeon: Fix warning in of_device_alloc on cn3xxx
MIPS: ftrace: Tweak safe_load()/safe_store() macros
MIPS: BCM47XX: Check all (32) GPIOs when looking for a pin
MIPS: Fix possible build error with transparent hugepages enabled
Diffstat (limited to 'include/linux/rmap.h')
0 files changed, 0 insertions, 0 deletions