You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		19 years ago
..
Kconfig	Linux-2.6.12-rc2	20 years ago
Makefile	Linux-2.6.12-rc2	20 years ago
aztcd.c	[PATCH] Overrun in cdrom/aztcd.c	19 years ago
aztcd.h	Linux-2.6.12-rc2	20 years ago
cdrom.c	[PATCH] fix cdrom open	19 years ago
cdu31a.c	[PATCH] kill cdrom ->dev_ioctl method	19 years ago
cdu31a.h	Linux-2.6.12-rc2	20 years ago
cm206.c	[PATCH] Remove MODULE_PARM	19 years ago
cm206.h	Linux-2.6.12-rc2	20 years ago
gscd.c	[PATCH] timer initialization cleanup: DEFINE_TIMER	20 years ago
gscd.h	Linux-2.6.12-rc2	20 years ago
isp16.c	[PATCH] Update CREDITS entry and listings in source files for Jesper Juhl	20 years ago
isp16.h	Linux-2.6.12-rc2	20 years ago
mcdx.c	[PATCH] drivers/cdrom: kmalloc + memset -> kzalloc conversion	19 years ago
mcdx.h	Linux-2.6.12-rc2	20 years ago
optcd.c	[PATCH] timer initialization cleanup: DEFINE_TIMER	20 years ago
optcd.h	Linux-2.6.12-rc2	20 years ago
sbpcd.c	[PATCH] Remove MODULE_PARM	19 years ago
sbpcd.h	Linux-2.6.12-rc2	20 years ago
sjcd.c	[PATCH] timer initialization cleanup: DEFINE_TIMER	20 years ago
sjcd.h	Linux-2.6.12-rc2	20 years ago
sonycd535.c	[PATCH] drivers/cdrom: fix-up schedule_timeout() usage	20 years ago
sonycd535.h	Linux-2.6.12-rc2	20 years ago
viocd.c	[PATCH] powerpc: update iSeries viocd and viotape device-tree	19 years ago