OpenCloudOS-Kernel/arch/ppc
Linus Torvalds 4522d58275 Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (156 commits)
  [PATCH] x86-64: Export smp_call_function_single
  [PATCH] i386: Clean up smp_tune_scheduling()
  [PATCH] unwinder: move .eh_frame to RODATA
  [PATCH] unwinder: fully support linker generated .eh_frame_hdr section
  [PATCH] x86-64: don't use set_irq_regs()
  [PATCH] x86-64: check vector in setup_ioapic_dest to verify if need setup_IO_APIC_irq
  [PATCH] x86-64: Make ix86 default to HIGHMEM4G instead of NOHIGHMEM
  [PATCH] i386: replace kmalloc+memset with kzalloc
  [PATCH] x86-64: remove remaining pc98 code
  [PATCH] x86-64: remove unused variable
  [PATCH] x86-64: Fix constraints in atomic_add_return()
  [PATCH] x86-64: fix asm constraints in i386 atomic_add_return
  [PATCH] x86-64: Correct documentation for bzImage protocol v2.05
  [PATCH] x86-64: replace kmalloc+memset with kzalloc in MTRR code
  [PATCH] x86-64: Fix numaq build error
  [PATCH] x86-64: include/asm-x86_64/cpufeature.h isn't a userspace header
  [PATCH] unwinder: Add debugging output to the Dwarf2 unwinder
  [PATCH] x86-64: Clarify error message in GART code
  [PATCH] x86-64: Fix interrupt race in idle callback (3rd try)
  [PATCH] x86-64: Remove unwind stack pointer alignment forcing again
  ...

Fixed conflict in include/linux/uaccess.h manually

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-12-07 08:59:11 -08:00
..
4xx_io [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
8xx_io WorkQueue: Fix up arch-specific work items where possible 2006-12-05 19:36:26 +00:00
8260_io WorkQueue: Fix up arch-specific work items where possible 2006-12-05 19:36:26 +00:00
amiga Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00
boot [POWERPC] Add files build to .gitignore 2006-12-04 20:41:29 +11:00
configs [POWERPC] update prep_defconfig 2006-09-13 18:30:08 +10:00
kernel [PATCH] relocatable kernel: Kallsyms generate relocatable symbols 2006-12-07 02:14:04 +01:00
lib Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mm [PATCH] mm: use symbolic names instead of indices for zone initialisation 2006-10-11 11:14:14 -07:00
platforms [POWERPC] Compilation fixes for ppc4xx PCI-less configs 2006-12-04 20:39:24 +11:00
syslib [POWERPC] 8xx: Off-by-one fixes to SCC parameter RAM definitions 2006-12-04 20:39:40 +11:00
xmon [POWERPC] PPC: Fix xmon stack frame address in backtrace 2006-09-21 22:55:06 +10:00
.gitignore [POWERPC] Add files build to .gitignore 2006-12-04 20:41:29 +11:00
Kconfig [POWERPC] Generic DCR infrastructure 2006-12-04 16:08:25 +11:00
Kconfig.debug ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc 2006-03-28 10:22:10 +11:00
Makefile Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc 2006-03-28 17:03:19 +11:00