kernel-fxtec-pro1x/arch/powerpc/platforms
Linus Torvalds e533b22705 Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  do_generic_file_read: s/EINTR/EIO/ if lock_page_killable() fails
  softirq, warning fix: correct a format to avoid a warning
  softirqs, debug: preemption check
  x86, pci-hotplug, calgary / rio: fix EBDA ioremap()
  IO resources, x86: ioremap sanity check to catch mapping requests exceeding, fix
  IO resources, x86: ioremap sanity check to catch mapping requests exceeding the BAR sizes
  softlockup: Documentation/sysctl/kernel.txt: fix softlockup_thresh description
  dmi scan: warn about too early calls to dmi_check_system()
  generic: redefine resource_size_t as phys_addr_t
  generic: make PFN_PHYS explicitly return phys_addr_t
  generic: add phys_addr_t for holding physical addresses
  softirq: allocate less vectors
  IO resources: fix/remove printk
  printk: robustify printk, update comment
  printk: robustify printk, fix #2
  printk: robustify printk, fix
  printk: robustify printk

Fixed up conflicts in:
	arch/powerpc/include/asm/types.h
	arch/powerpc/platforms/Kconfig.cputype
manually.
2008-10-16 15:17:40 -07:00
..
8xx powerpc: Add support for the MPC852 based mgsuvd board from keymile. 2008-09-16 10:01:30 -05:00
40x [POWERPC] 4xx: Create common ppc4xx_reset_system() in ppc4xx_soc.c 2008-04-02 20:44:56 -05:00
44x powerpc/44x: Add AMCC Arches eval board support 2008-10-02 13:08:02 -04:00
52xx powerpc/mpc5200: Silence warnings in arch/powerpc/platforms/52xx/mpc52xx_pci.c 2008-10-08 11:36:57 -06:00
82xx Merge commit 'origin' 2008-10-15 11:31:54 +11:00
83xx powerpc/83xx: don't probe broken PCI on mpc837x_mds boards 2008-10-13 11:09:58 -05:00
85xx powerpc: make Freescale QE support a selectable Kconfig option 2008-10-13 11:09:58 -05:00
86xx powerpc: FPGA support for GE Fanuc SBC610 2008-10-13 11:10:00 -05:00
512x powerpc/5121: Add PCI support. 2008-10-13 11:09:58 -05:00
cell Merge commit 'origin' 2008-10-15 11:31:54 +11:00
chrp Merge commit 'origin' 2008-10-15 11:31:54 +11:00
embedded6xx powerpc: Drop redundant machine type print in show_cpuinfo 2008-09-29 09:23:06 -05:00
iseries powerpc: Use LOAD_REG_IMMEDIATE only for constants on 64-bit 2008-09-15 11:08:35 -07:00
maple Merge commit 'origin' 2008-10-15 11:31:54 +11:00
pasemi phylib: two dynamic mii_bus allocation fallout fixes 2008-10-09 09:45:04 -07:00
powermac Merge commit 'origin' 2008-10-15 11:31:54 +11:00
prep
ps3 powerpc: Drop archdata numa_node 2008-09-24 16:26:43 -05:00
pseries Merge commit 'origin' 2008-10-15 11:31:54 +11:00
fsl_uli1575.c powerpc: Fix boot hang regression on MPC8544DS 2008-10-02 00:58:49 -05:00
Kconfig powerpc/QE: move QE_GPIO Kconfig symbol into the platforms/Kconfig 2008-10-13 11:09:58 -05:00
Kconfig.cputype Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2008-10-16 15:17:40 -07:00
Makefile powerpc: Remove use of CONFIG_PPC_MERGE 2008-08-04 13:18:17 +10:00