From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jul 2011 00:12:10 +0000 (-0700)
Subject: Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~4843
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3960ef326a1838971466193ffa008ff37c1d978d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'next/cross-platform' of git://git./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
---

3960ef326a1838971466193ffa008ff37c1d978d