Linus Torvalds 3960ef326a 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
2011-07-26 17:12:10 -07:00
..
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:51 +02:00
2010-10-07 14:08:55 +01:00
2008-05-01 08:03:58 -07:00
2009-06-11 21:02:42 +02:00
2005-04-16 15:20:36 -07:00
2011-03-17 09:19:04 +08:00
2010-10-07 14:08:55 +01:00
2005-04-16 15:20:36 -07:00
2008-08-12 16:07:31 -07:00
2010-10-07 14:08:55 +01:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2011-01-13 17:32:47 -08:00
2009-06-11 21:02:15 +02:00
2009-09-09 13:29:18 -07:00
2010-09-10 10:56:51 +02:00
2007-05-11 08:29:34 -07:00
2009-06-11 21:02:15 +02:00
2011-03-31 11:26:23 -03:00
2009-06-11 21:02:15 +02:00
2011-03-17 09:19:04 +08:00
2009-06-11 21:02:15 +02:00
2010-08-09 16:48:44 -04:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:42 +02:00
2011-05-20 12:50:29 -07:00