tree 282b74377bccb9fa79639ce4df2dcb48652dbdec
parent 62c9072bee2272232d0ed92dc8148c48c1f10f8e
parent c8f85523e70f8202ff49858bacd72fa65245f382
author Linus Torvalds <torvalds@linux-foundation.org> 1311725530 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311725530 -0700

Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

* 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  ARM: Consolidate the clkdev header files
  ARM: set vga memory base at run-time
  ARM: convert PCI defines to variables
  ARM: pci: make pcibios_assign_all_busses use pci_has_flag
  ARM: remove unnecessary mach/hardware.h includes
  pci: move microblaze and powerpc pci flag functions into asm-generic
  powerpc: rename ppc_pci_*_flags to pci_*_flags

Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h