tree e5f77a7bf65cd4b2d564c2b6cec49b3770796f17
parent ad465470563152f8dcc61161148ff620efefb2a8
parent eda4ddf7e3a2245888e8c45c566fd514cdd5abbb
author Linus Torvalds <torvalds@linux-foundation.org> 1372187287 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1372187287 -1000

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Martin Schwidefsky:
 "A couple of last-minute fixes: a build regression for !SMP, a recent
  memory detection patch caused kdump to break, a regression in regard
  to sscanf vs reboot from FCP, and two fixes in the DMA mapping code
  for PCI"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/ipl: Fix FCP WWPN and LUN format strings for read
  s390/mem_detect: fix memory hole handling
  s390/dma: support debug_dma_mapping_error
  s390/dma: fix mapping_error detection
  s390/irq: Only define synchronize_irq() on SMP