Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Jun 2014 23:15:33 +0000 (16:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Jun 2014 23:15:33 +0000 (16:15 -0700)
commit2b03adc1911d1c84cb7fad8b424234f589547cb3
treeca817632d166046bbfe917894afd99c698d47627
parenteb3d3ec567e868c8a3bfbfdfc9465ffd52983d11
parent225fba216261b0e24273f5f4eee504e3c7bd0255
Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into next

Pull Microblaze updates from Michal Simek:
 - cleanup PCI and DMA handling
 - use generic device.h
 - some cleanups

* tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix typo in head.S s/substract/subtract/
  microblaze: remove check for CONFIG_XILINX_CONSOLE
  microblaze: Use generic device.h
  microblaze: Do not setup empty unmap_sg function
  microblaze: Remove device_to_mask
  microblaze: Clean device dma_ops structure
  microblaze: Cleanup PCI_DRAM_OFFSET handling
  microblaze: Do not setup pci_dma_ops
  microblaze: Return default dma operations
  microblaze: Enable SERIAL_OF_PLATFORM
arch/microblaze/include/asm/pci.h
arch/microblaze/pci/pci-common.c
drivers/of/platform.c