kernel-ark/arch/ppc/kernel
Linus Torvalds 489de30259 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits)
  [POWERPC] Create add_rtc() function to enable the RTC CMOS driver
  [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number
  [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration
  [POWERPC] Oprofile support for Power 5++
  [POWERPC] Enable arbitary speed tty ioctls and split input/output speed
  [POWERPC] Make drivers/char/hvc_console.c:khvcd() static
  [POWERPC] Remove dead code for preventing pread() and pwrite() calls
  [POWERPC] Remove unnecessary #undef printk from prom.c
  [POWERPC] Fix typo in Ebony default DTS
  [POWERPC] Check for NULL ppc_md.init_IRQ() before calling
  [POWERPC] Remove extra return statement
  [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED
  [POWERPC] pasemi: Rename platform
  [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports
  [POWERPC] Add __read_mostly support for powerpc
  [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane
  [POWERPC] Create a dummy zImage if no valid platform has been selected
  [POWERPC] PS3: Bootwrapper support.
  [POWERPC] powermac i2c: Use mutex
  [POWERPC] Schedule removal of arch/ppc
  ...

Fixed up conflicts manually in:

	Documentation/feature-removal-schedule.txt
	arch/powerpc/kernel/pci_32.c
	arch/powerpc/kernel/pci_64.c
	include/asm-powerpc/pci.h

and asked the powerpc people to double-check the result..
2007-07-16 17:58:08 -07:00
..
asm-offsets.c rename thread_info to stack 2007-05-09 12:30:56 -07:00
cpu_setup_power4.S
entry.S [PPC] Fix COMMON symbol warnings 2007-05-23 00:17:44 -05:00
head_4xx.S
head_8xx.S
head_44x.S
head_booke.h
head_fsl_booke.S [POWERPC] 85xx: Drop use of SYNC macro in head_fsl_booke.S 2007-02-13 16:13:27 -06:00
head.S [POWERPC] Remove the broken Gemini support 2007-01-24 21:13:58 +11:00
machine_kexec.c
Makefile [POWERPC] 8xx: generic 8xx code arch/powerpc port 2007-02-07 14:01:02 +11:00
misc.S [POWERPC] Merge CPU features pertaining to icache coherency 2007-06-14 22:30:16 +10:00
pci.c PCI: Use a weak symbol for the empty version of pcibios_add_platform_entries() 2007-07-11 16:02:07 -07:00
ppc_htab.c header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
ppc_ksyms.c [POWERPC] Remove unused do_signal export 2007-07-10 21:53:36 +10:00
ppc-stub.c
relocate_kernel.S
rio.c
semaphore.c
setup.c [POWERPC] Merge CPU features pertaining to icache coherency 2007-06-14 22:30:16 +10:00
smp-tbsync.c [POWERPC] Fix irq enable/disable in smp_generic_take_timebase 2006-08-30 16:10:47 +10:00
smp.c header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
softemu8xx.c
time.c [POWERPC] ppc: Add missing calls to set_irq_regs 2006-10-16 15:52:14 +10:00
traps.c generic bug: use show_regs() instead of dump_stack() 2007-07-16 09:05:51 -07:00
vmlinux.lds.S all-archs: consolidate .data section definition in asm-generic 2007-05-19 09:11:57 +02:00