]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'for-upstream' of git://openrisc.net/jonas/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jul 2011 16:55:18 +0000 (09:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jul 2011 16:55:18 +0000 (09:55 -0700)
* 'for-upstream' of git://openrisc.net/jonas/linux: (24 commits)
  OpenRISC: Add MAINTAINERS entry
  OpenRISC: Miscellaneous
  OpenRISC: Library routines
  OpenRISC: Headers
  OpenRISC: Traps
  OpenRISC: Module support
  OpenRISC: GPIO
  OpenRISC: Scheduling/Process management
  OpenRISC: Idle/Power management
  OpenRISC: System calls
  OpenRISC: IRQ
  OpenRISC: Timekeeping
  OpenRISC: DMA
  OpenRISC: PTrace
  OpenRISC: Build infrastructure
  OpenRISC: Signal handling
  OpenRISC: Memory management
  OpenRISC: Device tree
  OpenRISC: Boot code
  iomap: make IOPORT/PCI mapping functions conditional
  ...

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge