Linus Torvalds 662f11cf2a Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Fix PCI ROM access powerpc/pseries: Really fix the oprofile CPU type on pseries serial/nwpserial: Fix wrong register read address and add interrupt acknowledge. powerpc/cell: Make ptcal more reliable powerpc: Allow mem=x cmdline to work with 4G+ powerpc/mpic: Fix incorrect allocation of interrupt rev-map powerpc: Fix oprofile sampling of marked events on POWER7 powerpc/iseries: Fix pci breakage due to bad dma_data initialization powerpc: Fix mktree build error on Mac OS X host powerpc/virtex: Fix duplicate level irq events. powerpc/virtex: Add uImage to the default images list powerpc/boot: add simpleImage.* to clean-files list powerpc/8xx: Update defconfigs powerpc/embedded6xx: Update defconfigs powerpc/86xx: Update defconfigs powerpc/85xx: Update defconfigs powerpc/83xx: Update defconfigs powerpc/fsl_soc: Remove mpc83xx_wdt_init, again		2009-05-15 08:05:02 -07:00
..
iseries	powerpc/iseries: Fix pci breakage due to bad dma_data initialization	2009-05-15 16:43:41 +10:00
8xx_immap.h
8253pit.h
abs_addr.h
agp.h
asm-compat.h
atomic.h	atomic_t: unify all arch definitions	2009-01-06 15:59:10 -08:00
auxvec.h
backlight.h
bitops.h
bootx.h	powerpc: Fix warnings from make headers_check	2009-02-23 10:48:57 +11:00
btext.h
bug.h	powerpc: Fix asm EMIT_BUG_ENTRY with !CONFIG_BUG	2008-12-16 15:53:23 +11:00
bugs.h
byteorder.h	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
cache.h
cacheflush.h
cell-pmu.h	powerpc/oprofile: IBM CELL: add SPU event profiling support	2009-01-08 15:51:55 +01:00
cell-regs.h
checksum.h
clk_interface.h
code-patching.h	powerpc: Unify opcode definitions and support	2009-02-23 10:48:56 +11:00
compat.h	x86-64: seccomp: fix 32/64 syscall hole	2009-03-02 15:41:30 -08:00
cpm1.h
cpm2.h
cpm.h
cputable.h	Merge commit 'origin/master' into next	2009-03-24 13:38:30 +11:00
cputhreads.h
cputime.h
current.h
dbdma.h
dbell.h	powerpc: Add support for using doorbells for SMP IPI	2009-02-23 15:53:03 +11:00
dcr-generic.h
dcr-mmio.h
dcr-native.h	powerpc/4xx: Extended DCR support v2	2008-12-21 14:21:15 +11:00
dcr-regs.h
dcr.h	powerpc: Const-qualify Device Node Argument to DCR Resource Extent API	2008-12-21 14:21:16 +11:00
delay.h
device.h
disassemble.h	ppc: Create disassemble.h to extract instruction fields	2008-12-31 16:52:21 +02:00
div64.h
dma-mapping.h	powerpc: expect all devices calling dma ops to have archdata set	2009-03-24 13:47:31 +11:00
dma.h
edac.h
eeh_event.h
eeh.h
elf.h	powerpc: ppc32 needs elf_read_implies_exec()	2009-04-28 13:52:19 +10:00
emergency-restart.h
errno.h
exception.h
fb.h
fcntl.h
feature-fixups.h	powerpc/mm: Introduce MMU features	2008-12-21 14:21:16 +11:00
firmware.h
fixmap.h	powerpc/mm: Tweak PTE bit combination definitions	2009-03-24 13:47:33 +11:00
floppy.h
fs_pd.h
fsl_gtm.h
fsl_lbc.h
ftrace.h	powerpc32, ftrace: save and restore mcount regs with macro	2009-02-23 10:48:54 +11:00
futex.h	powerpc: Fix data-corrupting bug in __futex_atomic_op	2009-04-15 15:23:53 +10:00
gpio.h
grackle.h
hardirq.h
heathrow.h
highmem.h	mm: use debug_kmap_atomic	2009-04-01 08:59:14 -07:00
hugetlb.h	mm: report the MMU pagesize in /proc/pid/smaps	2009-01-06 15:58:58 -08:00
hvcall.h
hvconsole.h
hvcserver.h
hw_irq.h	powerpc/irq: Convert obsolete hw_interrupt_type to struct irq_chip	2009-03-11 17:11:34 +11:00
hydra.h
i8259.h
ibmebus.h
ide.h
immap_86xx.h
immap_cpm2.h
immap_qe.h
io-defs.h
io.h	powerpc: Wire up /proc/vmallocinfo to our ioremap()	2009-03-11 17:10:14 +11:00
ioctl.h
ioctls.h	powerpc: Add ioctls for RS485 mode control of serial drivers	2009-01-08 16:25:12 +11:00
iommu.h
ipcbuf.h
ipic.h
irq_regs.h
irq.h
irqflags.h
Kbuild	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
kdebug.h
kdump.h	powerpc/32: Wire up the trampoline code for kdump	2008-12-23 15:13:29 +11:00
kexec.h	powerpc/kdump: Use ppc_save_regs() in crash_setup_regs()	2009-01-08 16:25:17 +11:00
keylargo.h
kgdb.h
kmap_types.h
kprobes.h
kvm_44x.h	KVM: ppc: move struct kvmppc_44x_tlbe into 44x-specific header	2009-03-24 11:02:55 +02:00
kvm_asm.h	KVM: ppc: Add extra E500 exceptions	2009-03-24 11:02:59 +02:00
kvm_e500.h	KVM: ppc: E500 core-specific code	2009-03-24 11:02:58 +02:00
kvm_host.h	KVM: ppc: remove debug support broken by KVM debug rewrite	2009-03-24 11:03:01 +02:00
kvm_para.h
kvm_ppc.h	KVM: ppc: remove debug support broken by KVM debug rewrite	2009-03-24 11:03:01 +02:00
kvm.h	Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-26 16:11:41 -07:00
libata-portmap.h
linkage.h
lmb.h
local.h
lppaca.h	powerpc/pseries: Add dispatch dispersion statistics	2009-04-07 15:18:59 +10:00
lv1call.h
machdep.h	powerpc: Wire up /proc/vmallocinfo to our ioremap()	2009-03-11 17:10:14 +11:00
macio.h
mc146818rtc.h
mediabay.h
mman.h
mmu_context.h	cpumask: Use mm_cpumask() wrapper instead of cpu_vm_mask	2009-03-24 13:47:29 +11:00
mmu-8xx.h	powerpc/mm: Rework context management for CPUs with no hash table	2008-12-21 14:21:15 +11:00
mmu-40x.h	powerpc/mm: Rework context management for CPUs with no hash table	2008-12-21 14:21:15 +11:00
mmu-44x.h	powerpc/44x: Support for 256KB PAGE_SIZE	2009-02-14 14:40:04 -05:00
mmu-book3e.h	Merge commit 'origin/master' into next	2009-03-30 14:04:53 +11:00
mmu-hash32.h
mmu-hash64.h	powerpc/mm: Introduce early_init_mmu() on 64-bit	2009-03-24 13:47:34 +11:00
mmu.h	Revert "powerpc: Add support for early tlbilx opcode"	2009-04-23 08:51:22 -05:00
mmzone.h	numa, cpumask: move numa_node_id default implementation to topology.h, fix	2009-03-19 12:51:25 +01:00
module.h
mpc6xx.h
mpc8xx.h
mpc52xx_psc.h	powerpc/mpc5200: add rts/cts handling in PSC UART driver	2008-12-21 02:54:32 -07:00
mpc52xx.h	powerpc/5200: add function to return external clock frequency	2009-03-11 09:36:26 -06:00
mpc86xx.h
mpc512x.h
mpc8260.h
mpic.h	powerpc: Add support for CoreInt delivery of interrupts on MPIC	2009-04-06 09:09:14 -05:00
msgbuf.h
msi_bitmap.h
mutex.h
nvram.h
of_device.h
of_platform.h	of: make of_(un)register_platform_driver common code	2009-05-02 15:36:10 -07:00
ohare.h
oprofile_impl.h	powerpc/oprofile: IBM CELL: add SPU event profiling support	2009-01-08 15:51:55 +01:00
paca.h
page_32.h	powerpc/44x: Support for 256KB PAGE_SIZE	2009-02-14 14:40:04 -05:00
page_64.h
page.h	powerpc/44x: Support for 256KB PAGE_SIZE	2009-02-14 14:40:04 -05:00
param.h
parport.h	parport_pc: Fix build failure drivers/parport/parport_pc.c for powerpc	2009-04-14 08:48:50 -07:00
pasemi_dma.h
pci-bridge.h	powerpc: Introduce ppc_pci_flags accessors	2008-12-16 15:53:16 +11:00
pci.h	PCI/MSI: Use #ifdefs instead of weak functions	2009-03-19 19:29:26 -07:00
percpu.h
pgalloc-32.h
pgalloc-64.h
pgalloc.h
pgtable-ppc32.h	powerpc/mm: Merge various PTE bits and accessors definitions	2009-03-24 13:47:33 +11:00
pgtable-ppc64-4k.h	powerpc/mm: Split the various pgtable-* headers based on MMU type	2009-03-20 15:56:57 +11:00
pgtable-ppc64-64k.h	powerpc/mm: Split the various pgtable-* headers based on MMU type	2009-03-20 15:56:57 +11:00
pgtable-ppc64.h	powerpc/mm: Add option for non-atomic PTE updates to ppc64	2009-03-24 13:47:34 +11:00
pgtable.h	powerpc/mm: Merge various PTE bits and accessors definitions	2009-03-24 13:47:33 +11:00
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 __REF macro instead of old .text.init.refok.	2009-04-27 19:51:58 -07:00
ppc-opcode.h	Revert "powerpc: Add support for early tlbilx opcode"	2009-04-23 08:51:22 -05:00
ppc-pci.h
processor.h	powerpc: Sanitize stack pointer in signal handling code	2009-03-27 16:58:24 +11:00
prom.h	powerpc: Add of_find_next_cache_node()	2008-12-21 14:21:14 +11:00
ps3.h	powerpc/ps3: Add rtc-ps3	2009-04-02 01:05:32 +00:00
ps3av.h	powerpc/ps3: Make ps3av_set_video_mode mode ID signed	2009-03-11 17:10:17 +11:00
ps3fb.h	powerpc: Remove duplicated #include's	2009-04-07 15:18:58 +10:00
ps3stor.h
pSeries_reconfig.h
pte-8xx.h	powerpc/mm: Tweak PTE bit combination definitions	2009-03-24 13:47:33 +11:00
pte-40x.h	powerpc/mm: Split the various pgtable-* headers based on MMU type	2009-03-20 15:56:57 +11:00
pte-44x.h	powerpc/mm: Split the various pgtable-* headers based on MMU type	2009-03-20 15:56:57 +11:00
pte-common.h	powerpc: Fix oops when loading modules	2009-04-07 15:19:01 +10:00
pte-fsl-booke.h	powerpc/mm: Unify PTE_RPN_SHIFT and _PAGE_CHG_MASK definitions	2009-03-20 15:56:58 +11:00
pte-hash32.h	powerpc/mm: Tweak PTE bit combination definitions	2009-03-24 13:47:33 +11:00
pte-hash64-4k.h	powerpc/mm: Tweak PTE bit combination definitions	2009-03-24 13:47:33 +11:00
pte-hash64-64k.h	powerpc/mm: Split the various pgtable-* headers based on MMU type	2009-03-20 15:56:57 +11:00
pte-hash64.h	powerpc/mm: Add option for non-atomic PTE updates to ppc64	2009-03-24 13:47:34 +11:00
ptrace.h
qe_ic.h	powerpc/qe: Fix few build errors with CONFIG_QUICC_ENGINE=n	2008-12-30 11:14:06 -06:00
qe.h	powerpc/qe: add Ethernet UPSMR definitions to QE library	2009-01-07 09:18:53 -06:00
reg_8xx.h
reg_booke.h	powerpc: Move SPEFSCR defines to common header	2009-04-02 10:41:31 -05:00
reg_fsl_emb.h
reg.h	powerpc: Move SPEFSCR defines to common header	2009-04-02 10:41:31 -05:00
resource.h
rheap.h
rio.h
rtas.h	powerpc/pseries: Scan for all events in rtasd	2009-04-07 15:18:59 +10:00
rtc.h
rwsem.h
scatterlist.h
seccomp.h	x86-64: seccomp: fix 32/64 syscall hole	2009-03-02 15:41:30 -08:00
sections.h
sembuf.h
serial.h
setjmp.h
setup.h
sfp-machine.h	powerpc/math-emu: Change types to work on ppc64	2009-04-02 16:17:36 -05:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h
smu.h
socket.h	net: new user space API for time stamping of incoming and outgoing packets	2009-02-15 22:43:33 -08:00
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h	Allow rwlocks to re-enable interrupts	2009-04-02 19:05:11 -07:00
spu_csa.h
spu_info.h	powerpc: Fix warnings from make headers_check	2009-02-23 10:48:57 +11:00
spu_priv1.h
spu.h	powerpc/cell: Bitops work on unsigned longs	2009-01-08 16:25:12 +11:00
sstep.h
stat.h
statfs.h
string.h
suspend.h	pm: cleanup includes	2009-04-01 08:59:16 -07:00
swab.h	powerpc: Fix warnings from make headers_check	2009-02-23 10:48:57 +11:00
synch.h
syscall.h
syscalls.h
systbl.h	powerpc: Wire up preadv and pwritev	2009-04-07 15:19:00 +10:00
system.h	powerpc: Allow mem=x cmdline to work with 4G+	2009-05-15 16:43:41 +10:00
tce.h
termbits.h
termios.h
thread_info.h	Merge commit 'jwb/next' into next	2009-03-03 13:30:03 +11:00
time.h
timex.h
tlb.h
tlbflush.h	powerpc/mm: Split low level tlb invalidate for nohash processors	2008-12-21 14:21:16 +11:00
topology.h	cpumask: remove node_to_first_cpu	2009-03-30 22:05:12 +10:30
tsi108_irq.h
tsi108_pci.h
tsi108.h
types.h	powerpc: Change u64/s64 to a long long integer type	2009-01-13 14:47:59 +11:00
uaccess.h
ucc_fast.h
ucc_slow.h
ucc.h
ucontext.h
udbg.h	powerpc/udbg: Fix lost byte during console handover; change LFCR to CRLF	2009-03-11 17:11:34 +11:00
uic.h
unaligned.h
uninorth.h
unistd.h	powerpc: Wire up preadv and pwritev	2009-04-07 15:19:00 +10:00
user.h
vdso_datapage.h
vdso.h
vga.h
vio.h
xilinx_intc.h
xmon.h
xor.h