From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Jul 2011 16:55:18 +0000 (-0700)
Subject: Merge branch 'for-upstream' of git://openrisc.net/jonas/linux
X-Git-Tag: v3.1-rc1~262
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff0c4ad2c3a75ccfe6adca916e50804eb45bb2d9;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-upstream' of git://openrisc.net/jonas/linux

* '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
  ...
---

ff0c4ad2c3a75ccfe6adca916e50804eb45bb2d9