openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/ppc/platforms
History
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
..
4xx [POWERPC] ppc32: fix CPCI405 board support 2006-06-15 19:31:27 +10:00
83xx ppc32: Fix BCSR_SIZE for MPC834x SYS 2006-02-21 23:34:07 -06:00
85xx [PATCH] PCI: fix error with pci_get_device() call in the mpc85xx driver 2006-06-21 12:00:01 -07:00
Makefile ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc 2006-03-28 10:22:10 +11:00
apus_pci.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
apus_pci.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
apus_setup.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
bseip.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ccm.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
chestnut.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
chestnut.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
cpci690.c [PATCH] ppc: Fix platform_notify functions marked __init 2006-03-17 13:23:21 +11:00
cpci690.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
est8260.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ev64260.c [PATCH] ppc: Fix platform_notify functions marked __init 2006-03-17 13:23:21 +11:00
ev64260.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
ev64360.c [PATCH] ppc: Fix platform_notify functions marked __init 2006-03-17 13:23:21 +11:00
ev64360.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
fads.h [PATCH] ppc32: MPC885ADS, MPC866ADS and MPC8272ADS-specific platform stuff for fs_enet 2006-02-07 22:36:33 +11:00
gemini.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
gemini_pci.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
gemini_prom.S [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
gemini_serial.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
gemini_setup.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
hdpu.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-03-22 22:20:46 -08:00
hdpu.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
hermes.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip860.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ivms8.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
katana.c [PATCH] ppc: Fix platform_notify functions marked __init 2006-03-17 13:23:21 +11:00
katana.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
lantec.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
lite5200.c [PATCH] ppc32: Reorganize and complete MPC52xx initial cpu setup 2006-03-27 14:49:00 +11:00
lite5200.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
lopec.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
lopec.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
lwmon.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mbx.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mpc866ads_setup.c [PATCH] ppc32 CPM_UART: fixes and improvements 2006-05-03 23:06:44 +10:00
mpc885ads.h [PATCH] ppc32: ppc_sys fixes for 8xx and 82xx 2005-10-29 14:49:29 +10:00
mpc885ads_setup.c [PATCH] ppc32: Update board-specific code of the CPM UART users 2006-04-28 21:11:30 +10:00
mpc8272ads_setup.c [PATCH] ppc32 CPM_UART: various fixes for pq2 uart users 2006-05-26 22:38:56 +10:00
mvme5100.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
mvme5100.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pal4.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
pal4_pci.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
pal4_serial.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
pal4_setup.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
pcu_e.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
powerpmc250.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
powerpmc250.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pplus.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
pplus.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
pq2ads.c [PATCH] ppc32: Update board-specific code of the CPM UART users 2006-04-28 21:11:30 +10:00
pq2ads.h [PATCH] ppc32: MPC885ADS, MPC866ADS and MPC8272ADS-specific platform stuff for fs_enet 2006-02-07 22:36:33 +11:00
pq2ads_pd.h [PATCH] ppc32: MPC885ADS, MPC866ADS and MPC8272ADS-specific platform stuff for fs_enet 2006-02-07 22:36:33 +11:00
prep_pci.c [PATCH] powerpc: Remove sections use from ppc 2005-09-19 09:38:49 +10:00
prep_setup.c Merge ../linux-2.6 2006-03-29 13:24:50 +11:00
prpmc750.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
prpmc750.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
prpmc800.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
prpmc800.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
radstone_ppc7d.c [PATCH] ppc: Fix platform_notify functions marked __init 2006-03-17 13:23:21 +11:00
radstone_ppc7d.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
residual.c [PATCH] powerpc: Remove sections use from ppc 2005-09-19 09:38:49 +10:00
rpx8260.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
rpxclassic.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
rpxhiox.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
rpxlite.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sandpoint.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
sandpoint.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
sbc82xx.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
sbc82xx.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sbs8260.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
spruce.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
spruce.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tqm8xx.h [PATCH] ppc32: Remove board support for SM850 2005-09-05 00:05:55 -07:00
tqm8260.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tqm8260_setup.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00