Benjamin Herrenschmidt 6dc6472581 Merge commit 'origin' ... Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h		2008-10-15 11:31:54 +11:00
..
iseries
8xx_immap.h
8253pit.h
abs_addr.h
agp.h
asm-compat.h
atomic.h
auxvec.h
backlight.h
bitops.h
bootx.h
btext.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h
cell-pmu.h
cell-regs.h
checksum.h
clk_interface.h
code-patching.h
compat.h
cpm1.h
cpm2.h	fs_enet: Fix SCC Ethernet on CPM2, and crash in fs_enet_rx_napi()	2008-08-27 05:16:38 -04:00
cpm.h
cputable.h	powerpc: Add new CPU feature: CPU_FTR_CP_USE_DCBTZ	2008-09-15 11:07:38 -07:00
cputhreads.h
cputime.h
current.h
dbdma.h
dcr-generic.h
dcr-mmio.h
dcr-native.h
dcr-regs.h	ibm_newemac: Fix EMAC soft reset on 460EX/GT	2008-10-08 15:27:14 -07:00
dcr.h
delay.h
device.h	powerpc: Drop archdata numa_node	2008-09-24 16:26:43 -05:00
div64.h
dma-mapping.h	powerpc: Merge 32 and 64-bit dma code	2008-09-24 16:26:45 -05:00
dma.h
edac.h
eeh_event.h
eeh.h
elf.h	Fix compile failure with non modular builds	2008-09-17 09:14:42 -07:00
emergency-restart.h
errno.h
exception.h	powerpc: Make it possible to move the interrupt handlers away from the kernel	2008-09-15 11:08:08 -07:00
fb.h
fcntl.h
feature-fixups.h
firmware.h
fixmap.h
floppy.h
fs_pd.h
fsl_gtm.h
fsl_lbc.h	powerpc: fix fsl_upm nand driver modular build	2008-10-13 11:48:24 -05:00
ftrace.h
futex.h
gpio.h
grackle.h
hardirq.h
heathrow.h
highmem.h	powerpc: Fixes for CONFIG_PTE_64BIT for SMP support	2008-09-24 16:29:41 -05:00
hugetlb.h
hvcall.h	powerpc: Make CMO paging space pool ID and page size available	2008-08-18 14:22:34 +10:00
hvconsole.h
hvcserver.h
hw_irq.h
hydra.h
i8259.h
ibmebus.h
ide.h	cleanup powerpc/include/asm/ide.h	2008-08-18 21:40:03 +02:00
immap_86xx.h
immap_cpm2.h
immap_qe.h
io-defs.h
io.h	POWERPC: Allow 32-bit hashed pgtable code to support 36-bit physical	2008-09-24 16:29:44 -05:00
ioctl.h
ioctls.h
iommu.h
ipcbuf.h
ipic.h
irq_regs.h
irq.h	powerpc: Separate the irq radix tree insertion and lookup	2008-09-15 11:08:44 -07:00
irqflags.h	powerpc: Fix lockdep IRQ tracing bug	2008-08-18 14:22:34 +10:00
Kbuild
kdebug.h
kdump.h
kexec.h	kexec jump: rename KEXEC_CONTROL_CODE_SIZE to KEXEC_CONTROL_PAGE_SIZE	2008-08-15 08:35:42 -07:00
keylargo.h
kgdb.h
kmap_types.h
kprobes.h
kvm_asm.h
kvm_host.h
kvm_para.h
kvm_ppc.h
kvm.h
libata-portmap.h
linkage.h
lmb.h
local.h
lppaca.h
lv1call.h
machdep.h	powerpc: Merge 32 and 64-bit dma code	2008-09-24 16:26:45 -05:00
macio.h
mc146818rtc.h
mediabay.h
mman.h	powerpc: Get USE_STRICT_MM_TYPECHECKS working again	2008-10-14 10:35:27 +11:00
mmu_context.h	powerpc: Fix loss of vdso on fork on 32-bit	2008-08-18 14:22:34 +10:00
mmu-8xx.h
mmu-40x.h
mmu-44x.h
mmu-fsl-booke.h
mmu-hash32.h
mmu-hash64.h	powerpc: Make the 64-bit kernel as a position-independent executable	2008-09-15 11:08:38 -07:00
mmu.h
mmzone.h
module.h
mpc6xx.h
mpc8xx.h
mpc52xx_psc.h
mpc52xx.h
mpc86xx.h
mpc512x.h
mpc8260.h
mpic.h	powerpc: Convert the MPIC MSI code to use msi_bitmap	2008-08-20 16:34:58 +10:00
msgbuf.h
msi_bitmap.h	powerpc: Split-out common MSI bitmap logic into msi_bitmap.c	2008-08-20 16:34:57 +10:00
mutex.h
nvram.h
of_device.h	powerpc: Remove include of linux/of_device.h from asm/of_device.h	2008-08-20 16:34:59 +10:00
of_platform.h	powerpc: Remove include of linux/of_platform.h from asm/of_platform.h	2008-08-20 16:34:58 +10:00
ohare.h
oprofile_impl.h
paca.h	powerpc: Make it possible to move the interrupt handlers away from the kernel	2008-09-15 11:08:08 -07:00
page_32.h	POWERPC: Allow 32-bit hashed pgtable code to support 36-bit physical	2008-09-24 16:29:44 -05:00
page_64.h
page.h	powerpc: Make the 64-bit kernel as a position-independent executable	2008-09-15 11:08:38 -07:00
param.h
parport.h
pasemi_dma.h
pci-bridge.h
pci.h	powerpc: Merge 32 and 64-bit dma code	2008-09-24 16:26:45 -05:00
percpu.h
pgalloc-32.h
pgalloc-64.h
pgalloc.h
pgtable-4k.h
pgtable-64k.h
pgtable-ppc32.h	powerpc: Get USE_STRICT_MM_TYPECHECKS working again	2008-10-14 10:35:27 +11:00
pgtable-ppc64.h	powerpc: Get USE_STRICT_MM_TYPECHECKS working again	2008-10-14 10:35:27 +11:00
pgtable.h
phyp_dump.h
pmac_feature.h
pmac_low_i2c.h
pmac_pfunc.h
pmc.h
pmi.h
poll.h
posix_types.h
ppc4xx.h
ppc_asm.h	powerpc: Use LOAD_REG_IMMEDIATE only for constants on 64-bit	2008-09-15 11:08:35 -07:00
ppc-pci.h
processor.h
prom.h
ps3.h
ps3av.h
ps3fb.h
ps3stor.h
pSeries_reconfig.h
ptrace.h
qe_ic.h
qe.h
reg_8xx.h
reg_booke.h	powerpc: Introduce local (non-broadcast) forms of tlb invalidates	2008-09-24 16:29:40 -05:00
reg_fsl_emb.h
reg.h
resource.h
rheap.h
rio.h
rtas.h
rtc.h
rwsem.h
scatterlist.h
seccomp.h
sections.h	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
sembuf.h
serial.h
setjmp.h
setup.h
sfp-machine.h	powerpc/math-emu: Use kernel generic math-emu code	2008-10-01 08:40:07 -05:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h	signals: demultiplexing SIGTRAP signal	2008-09-23 13:26:52 +02:00
signal.h
smp.h	powerpc: Make ppc32 respect the boot cpu id for !CONFIG_SMP	2008-10-13 10:56:19 +11:00
smu.h
socket.h
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h
spu_csa.h
spu_info.h
spu_priv1.h
spu.h
sstep.h
stat.h
statfs.h	PowerPC: Use <asm-generic/statfs.h>	2008-09-06 19:30:15 +01:00
string.h
suspend.h
synch.h
syscall.h
syscalls.h
systbl.h	powerpc: Use sys_pause for 32-bit pause entry point	2008-09-15 11:08:39 -07:00
system.h
tce.h
termbits.h
termios.h
thread_info.h
time.h
timex.h
tlb.h
tlbflush.h	powerpc: Introduce local (non-broadcast) forms of tlb invalidates	2008-09-24 16:29:40 -05:00
topology.h
tsi108_irq.h
tsi108_pci.h
tsi108.h
types.h	powerpc: Make dma_addr_t a u64 if CONFIG_PHYS_64BIT is set	2008-09-24 16:26:45 -05:00
uaccess.h
ucc_fast.h
ucc_slow.h
ucc.h
ucontext.h
udbg.h
uic.h
unaligned.h
uninorth.h
unistd.h
user.h
vdso_datapage.h
vdso.h
vga.h
vio.h
xilinx_intc.h
xmon.h
xor.h