summaryrefslogtreecommitdiffstats
path: root/include/linux/sa11x0-dma.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-23 07:23:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-23 07:23:09 -0700
commiteb63b34bdfbdd70a734c2a90d89117c5c6c605c2 (patch)
treee9d07ea9a6f3cae78be55e1400a2b7a08a5954e4 /include/linux/sa11x0-dma.h
parentc4c53bad4095aec461ed2488534ce6c7e672228a (diff)
parent72ccc89e38031183323f8e715503d7e61fcff2ab (diff)
downloadblackbird-op-linux-eb63b34bdfbdd70a734c2a90d89117c5c6c605c2.tar.gz
blackbird-op-linux-eb63b34bdfbdd70a734c2a90d89117c5c6c605c2.zip
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS bug fixes from Ralf Baechle: "Two more fixes for 4.2. One fixes a build issue with the LLVM assembler - LLVM assembler macro names are case sensitive, GNU as macro names are insensitive; the other corrects a license string (GPL v2, not GPLv2) such that the module loader will recognice the license correctly" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: FIRMWARE: bcm47xx_nvram: Fix module license. MIPS: Fix LLVM build issue.
Diffstat (limited to 'include/linux/sa11x0-dma.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud