linux/arch/um
Linus Torvalds 45c091bb2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
  [POWERPC] re-enable OProfile for iSeries, using timer interrupt
  [POWERPC] support ibm,extended-*-frequency properties
  [POWERPC] Extra sanity check in EEH code
  [POWERPC] Dont look for class-code in pci children
  [POWERPC] Fix mdelay badness on shared processor partitions
  [POWERPC] disable floating point exceptions for init
  [POWERPC] Unify ppc syscall tables
  [POWERPC] mpic: add support for serial mode interrupts
  [POWERPC] pseries: Print PCI slot location code on failure
  [POWERPC] spufs: one more fix for 64k pages
  [POWERPC] spufs: fail spu_create with invalid flags
  [POWERPC] spufs: clear class2 interrupt status before wakeup
  [POWERPC] spufs: fix Makefile for "make clean"
  [POWERPC] spufs: remove stop_code from struct spu
  [POWERPC] spufs: fix spu irq affinity setting
  [POWERPC] spufs: further abstract priv1 register access
  [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
  [POWERPC] spufs: dont try to access SPE channel 1 count
  [POWERPC] spufs: use kzalloc in create_spu
  [POWERPC] spufs: fix initial state of wbox file
  ...

Manually resolved conflicts in:
	drivers/net/phy/Makefile
	include/asm-powerpc/spu.h
2006-06-22 22:11:30 -07:00
..
drivers [PATCH] uml: fix patch mismerge 2006-05-01 18:17:44 -07:00
include [PATCH] uml: fix wall_to_monotonic initialization 2006-06-05 12:29:17 -07:00
kernel [PATCH] UML: fix wall_to_monotonic initialization 2006-06-22 15:05:55 -07:00
os-Linux [PATCH] uml: fix a typo in do_uml_initcalls 2006-06-05 12:29:17 -07:00
scripts [PATCH] uml: cleanup unprofile expression and build infrastructure 2006-05-01 18:17:45 -07:00
sys-i386 [PATCH] uml: more __user annotations 2006-06-05 12:29:17 -07:00
sys-ia64 Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sys-ppc [POWERPC] Remove stale 64bit on 32bit kernel code 2006-06-15 19:31:26 +10:00
sys-x86_64 [PATCH] uml: more __user annotations 2006-06-05 12:29:17 -07:00
config.release Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
defconfig [PATCH] uml: update defconfig 2006-05-01 18:17:44 -07:00
Kconfig [PATCH] uml: skas0 support for 2G/2G hosts 2006-05-01 18:17:43 -07:00
Kconfig.char [PATCH] uml: Rename Kconfig files to be like the other arches 2005-09-05 00:06:19 -07:00
Kconfig.debug [PATCH] uml: workaround GDB problems on debugging 2005-09-05 00:06:20 -07:00
Kconfig.i386 [PATCH] uml: skas0 support for 2G/2G hosts 2006-05-01 18:17:43 -07:00
Kconfig.net [PATCH] uml: Rename Kconfig files to be like the other arches 2005-09-05 00:06:19 -07:00
Kconfig.scsi [PATCH] uml: Rename Kconfig files to be like the other arches 2005-09-05 00:06:19 -07:00
Kconfig.x86_64 [PATCH] um: fix undefined reference to hweight32 2006-03-26 08:57:09 -08:00
Makefile [PATCH] uml: uml-makefile-nicer uses SYMLINK incorrectly 2006-05-01 18:17:45 -07:00
Makefile-i386 [PATCH] uml: add -ffreestanding to CFLAGS 2006-06-05 12:29:17 -07:00
Makefile-ia64 Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile-os-Linux Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile-ppc Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile-skas [PATCH] uml makefiles sanitized 2005-09-29 08:46:26 -07:00
Makefile-tt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile-x86_64 [PATCH] uml: eliminate symlinks to host arch 2006-03-31 12:18:50 -08:00