1
0
Fork 0
alistair23-linux/arch/powerpc/platforms/pseries
David Howells 9db7372445 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 17:01:28 +00:00
..
Kconfig powerpc: Disallow lparcfg being a module 2006-03-14 11:35:37 +11:00
Makefile [POWERPC] powerpc: Instrument Hypervisor Calls 2006-09-13 18:39:53 +10:00
eeh.c [POWERPC] EEH failure to mark pci slot as frozen. 2006-09-26 15:41:03 +10:00
eeh_cache.c [POWERPC] EEH: balance pcidev_get/put calls 2006-09-21 22:59:08 +10:00
eeh_driver.c [POWERPC] EEH: support MMIO enable recovery step 2006-09-21 22:59:20 +10:00
eeh_event.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
firmware.c [POWERPC] pseries: Constify & voidify get_property() 2006-07-31 15:55:04 +10:00
firmware.h [PATCH] powerpc: Move pSeries firmware feature setup into platforms/pseries 2006-02-10 16:52:03 +11:00
hvCall.S [POWERPC] powerpc: Instrument Hypervisor Calls 2006-09-13 18:39:53 +10:00
hvCall_inst.c [PATCH] inode_diet: Replace inode.u.generic_ip with inode.i_private 2006-09-27 08:26:17 -07:00
hvconsole.c [POWERPC] clean up pseries hcall interfaces 2006-08-01 16:19:15 +10:00
hvcserver.c [PATCH] powerpc/pseries: Change H_StudlyCaps to H_SHOUTING_CAPS 2006-04-01 22:36:57 +11:00
iommu.c [POWERPC] Refactor 64 bits DMA operations 2006-12-04 20:38:40 +11:00
lpar.c [POWERPC] Make pSeries_lpar_hpte_insert static 2006-10-16 16:33:04 +10:00
nvram.c [POWERPC] pseries: Constify & voidify get_property() 2006-07-31 15:55:04 +10:00
pci.c [POWERPC] Make pci_read_irq_line the default 2006-12-04 16:00:04 +11:00
pci_dlpar.c [POWERPC] Generic OF platform driver for PCI host bridges. 2006-12-04 20:38:49 +11:00
plpar_wrappers.h [POWERPC] Implement SLB shadow buffer 2006-08-08 17:08:56 +10:00
ras.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
ras.h [PATCH] cell: enable pause(0) in cpu_idle 2006-01-09 15:44:32 +11:00
reconfig.c [POWERPC] Replace kmalloc+memset with kzalloc 2006-12-04 20:42:09 +11:00
rtasd.c [POWERPC] pseries: Constify & voidify get_property() 2006-07-31 15:55:04 +10:00
scanlog.c [POWERPC] RTAS delay, fix module build breaks 2006-06-21 15:01:27 +10:00
setup.c [POWERPC] Wrap cpu_die() with CONFIG_HOTPLUG_CPU 2006-12-04 20:39:29 +11:00
smp.c [POWERPC] Cleanup CPU inits 2006-08-25 13:27:35 +10:00
xics.c [POWERPC] pSeries/kexec: Fix for interrupt distribution 2006-12-04 20:41:22 +11:00
xics.h IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00