From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Jun 2014 23:15:33 +0000 (-0700)
Subject: Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~91^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b03adc1911d1c84cb7fad8b424234f589547cb3;p=pandora-kernel.git

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
---

2b03adc1911d1c84cb7fad8b424234f589547cb3
Reading git-diff-tree failed