linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-16 22:51:32 +00:00

History

Linus Torvalds a9e1e53bcf 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

2012-04-10 10:28:26 -07:00

boot

Kbuild: centralize MKIMAGE and cmd_uimage definitions

2012-03-26 15:49:20 +02:00

configs

defconfig reduction

2010-08-14 22:26:53 +02:00

include/asm

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

kernel

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