tree c2e862c9232ea24b27c98b1791ba1368c8e8654e
parent 53cb430755f7dd36e42fa02603d166a07f3d94cd
parent d657784b70ef653350d7aa49da90a8484c29da7d
author Linus Torvalds <torvalds@linux-foundation.org> 1334078906 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1334078906 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:

1) Build fix for LEON, from Sam Ravnborg.

2) Make the sparc side changes that go along with the infrastructure to
   retry faults when blocking on a disk transfer.  From Kautuk Consul.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc32,leon: fix leon build
  sparc/mm/fault_32.c: Port OOM changes to do_sparc_fault
  sparc/mm/fault_64.c: Port OOM changes to do_sparc64_fault