commit 06b2e9886e039c2f1b3048c47e539b80ab4155b0
author Linus Torvalds <torvalds@linux-foundation.org> Sun May 30 09:02:02 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sun May 30 09:02:02 2010 -0700
tree cdc295333e93cf407fd205b21f31a12d75b0a635
parent 35926ff5fba8245bd1c6ac04155048f6f89232b1
parent 210501aa570fdaa8b06e56fd1c04f31f2d3f368b

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: Call pagefault_disable/pagefault_enable in kmap_atomic/kunmap_atomic
  parisc: Remove unnecessary macros from entry.S
  parisc: LWS fixes for syscall.S
  parisc: Delete unnecessary nop's in entry.S
  parisc: Avoid interruption in critical region in entry.S
  parisc: invoke oom-killer from page fault
  parisc: clear floating point exception flag on SIGFPE signal
  parisc: Use of align_frame provides stack frame.