From: Linus Torvalds Date: Tue, 10 Apr 2012 17:28:26 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc X-Git-Tag: Ubuntu-5.0.0-8.9~16337 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a9e1e53bcfb29b3b503a5e75ce498d9a64f32c1e;p=mirror_ubuntu-disco-kernel.git 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 --- a9e1e53bcfb29b3b503a5e75ce498d9a64f32c1e