Merge branch 'for-linus' of git://openrisc.net/~jonas/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Sep 2011 21:55:43 +0000 (14:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Sep 2011 21:55:43 +0000 (14:55 -0700)
* 'for-linus' of git://openrisc.net/~jonas/linux:
  Add missing DMA ops
  openrisc: don't use pt_regs in struct sigcontext


Trivial merge