android_kernel_motorola_sm6225/arch/ppc
Linus Torvalds ea62ccd00f 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: (231 commits)
  [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall
  [PATCH] i386: type may be unused
  [PATCH] i386: Some additional chipset register values validation.
  [PATCH] i386: Add missing !X86_PAE dependincy to the 2G/2G split.
  [PATCH] x86-64: Don't exclude asm-offsets.c in Documentation/dontdiff
  [PATCH] i386: avoid redundant preempt_disable in __unlazy_fpu
  [PATCH] i386: white space fixes in i387.h
  [PATCH] i386: Drop noisy e820 debugging printks
  [PATCH] x86-64: Fix allnoconfig error in genapic_flat.c
  [PATCH] x86-64: Shut up warnings for vfat compat ioctls on other file systems
  [PATCH] x86-64: Share identical video.S between i386 and x86-64
  [PATCH] x86-64: Remove CONFIG_REORDER
  [PATCH] x86-64: Print type and size correctly for unknown compat ioctls
  [PATCH] i386: Remove copy_*_user BUG_ONs for (size < 0)
  [PATCH] i386: Little cleanups in smpboot.c
  [PATCH] x86-64: Don't enable NUMA for a single node in K8 NUMA scanning
  [PATCH] x86: Use RDTSCP for synchronous get_cycles if possible
  [PATCH] i386: Add X86_FEATURE_RDTSCP
  [PATCH] i386: Implement X86_FEATURE_SYNC_RDTSC on i386
  [PATCH] i386: Implement alternative_io for i386
  ...

Fix up trivial conflict in include/linux/highmem.h manually.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-05 14:55:20 -07:00
..
4xx_io [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
8xx_io PCI: Cleanup the includes of <linux/pci.h> 2007-05-02 19:02:35 -07:00
8260_io PCI: Cleanup the includes of <linux/pci.h> 2007-05-02 19:02:35 -07:00
amiga Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00
boot [POWERPC] Add uartlite boot console driver for the zImage wrapper 2007-04-30 11:02:04 +10:00
configs [PPC] MPC8272 ADS compile fixed, defconfig refreshed. 2007-04-12 12:36:45 -05:00
kernel [PATCH] x86: Allow percpu variables to be page-aligned 2007-05-02 19:27:12 +02:00
lib [STRING]: Move strcasecmp/strncasecmp to lib/string.c 2007-04-26 01:54:39 -07:00
mm [POWERPC] Fix is_power_of_4(x) compile error 2007-02-09 09:30:05 -06:00
platforms Merge branch 'linux-2.6' into for-2.6.22 2007-04-30 12:38:01 +10:00
syslib PCI: Cleanup the includes of <linux/pci.h> 2007-05-02 19:02:35 -07:00
xmon [POWERPC] PPC: Use ARRAY_SIZE macro when appropriate 2007-02-08 16:08:25 +11:00
.gitignore [POWERPC] Add files build to .gitignore 2006-12-04 20:41:29 +11:00
Kconfig [NET] Eliminate user-selectable CONFIG_MV643XX_ETH_[012] 2007-02-20 17:11:55 +00: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