diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 17:01:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 17:01:56 -0700 |
commit | f4c16c581766a230c02bec4d513b09fe36264ae2 (patch) | |
tree | 497f4b62e1f8a88a686e1e52b0ab3a4d607f1420 /drivers/infiniband | |
parent | 3d1482fe7a835a18cb45894ed67f15466b60190f (diff) | |
parent | 207e715ff17b42e022df107210dc8c736a703eb3 (diff) | |
download | linux-f4c16c581766a230c02bec4d513b09fe36264ae2.tar.bz2 |
Merge tag 'for-3.5' of git://openrisc.net/jonas/linux
Pull OpenRISC updates from Jonas Bonn:
"A couple of cleanups for the OpenRISC architecture:
- Implement IRQ domains
- Use DMA mapping framework completely and catch up with recent
changes to dma_map_ops
- One bug fix to the "or1k_atomic" syscall to not clobber call-saved
registers
- OOM killer patches to the pagefault handler ported from the X86
arch
- ...and a couple of header file cleanups"
* tag 'for-3.5' of git://openrisc.net/jonas/linux:
openrisc: use scratch regs in atomic syscall
openrisc: provide dma_map_ops
openrisc: header file cleanups
openrisc/mm/fault.c: Port OOM changes to do_page_fault
openrisc: remove unnecessary includes
openrisc: implement irqdomains
Diffstat (limited to 'drivers/infiniband')
0 files changed, 0 insertions, 0 deletions