Ingo Molnar a3d06cc6aa Merge branch 'linus' into perfcounters/core ...

Conflicts:
	arch/x86/include/asm/kmap_types.h
	include/linux/mm.h

	include/asm-generic/kmap_types.h

Merge reason: We crossed changes with kmap_types.h cleanups in mainline.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-06-17 13:06:17 +02:00

..

vdso32

powerpc/mm: Introduce MMU features

2008-12-21 14:21:16 +11:00

vdso64

powerpc/mm: Introduce MMU features

2008-12-21 14:21:16 +11:00

.gitignore

…

align.c

powerpc: Keep track of emulated instructions

2009-05-21 15:44:26 +10:00

asm-offsets.c

Merge commit 'origin/master' into next

2009-06-12 16:53:38 +10:00

audit.c

…

btext.c

…

cacheinfo.c

powerpc/cacheinfo: Rename cache_dir per-cpu variable

2009-01-13 14:48:02 +11:00

cacheinfo.h

powerpc: Rewrite sysfs processor cache info code

2009-01-08 16:25:10 +11:00

clock.c

…

compat_audit.c

…

cpu_setup_6xx.S

powerpc/mm: e300c2/c3/c4 TLB errata workaround

2009-03-24 13:47:32 +11:00

cpu_setup_44x.S

AMCC PPC 460SX redwood SoC platform initial framework

2009-02-14 14:41:29 -05:00

cpu_setup_fsl_booke.S

powerpc/fsl-booke: Cleanup init/exception setup to be runtime

2009-01-28 18:16:50 -06:00

cpu_setup_pa6t.S

…

cpu_setup_ppc970.S

…

cputable.c

powerpc: Add 2.06 tlbie mnemonics

2009-05-21 15:44:21 +10:00

crash_dump.c

powerpc: Unify opcode definitions and support

2009-02-23 10:48:56 +11:00

crash.c

…

dbell.c

powerpc: Add support for using doorbells for SMP IPI

2009-02-23 15:53:03 +11:00

dma-iommu.c

powerpc: Change u64/s64 to a long long integer type

2009-01-13 14:47:59 +11:00

dma-swiotlb.c

powerpc: Add support for swiotlb on 32-bit

2009-06-09 16:49:18 +10:00

dma.c

powerpc: Add support for swiotlb on 32-bit

2009-06-09 16:49:18 +10:00

entry_32.S

powerpc: Unify opcode definitions and support

2009-02-23 10:48:56 +11:00

entry_64.S

Merge branch 'linus' into perfcounters/core-v2

2009-04-06 09:02:57 +02:00

exceptions-64s.S

powerpc: Split exception handling out of head_64.S

2009-06-09 16:47:37 +10:00

firmware.c

…

fpu.S

powerpc: Disable VSX or current process in giveup_fpu/altivec

2009-04-07 15:18:59 +10:00

ftrace.c

powerpc/ftrace: Use PPC_INST_NOP directly

2009-06-02 10:36:53 +10:00

head_8xx.S

powerpc: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:38 -07:00

head_32.S

powerpc: Fix bug in move of altivec code to vector.S

2009-06-12 16:51:41 +10:00

head_40x.S

powerpc: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:38 -07:00

head_44x.S

powerpc: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:38 -07:00

head_64.S

powerpc: Split exception handling out of head_64.S

2009-06-09 16:47:37 +10:00

head_booke.h

powerpc: Add PTRACE_SINGLEBLOCK support

2009-06-09 13:29:25 +10:00

head_fsl_booke.S

powerpc: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:38 -07:00

ibmebus.c

…

idle_6xx.S

…

idle_e500.S

…

idle_power4.S

…

idle.c

…

init_task.c

mm: consolidate init_mm definition

2009-06-16 19:47:28 -07:00

io.c

…

iomap.c

…

iommu.c

powerpc: Change u64/s64 to a long long integer type

2009-01-13 14:47:59 +11:00

irq.c

Merge commit 'origin/master' into next

2009-06-12 16:53:38 +10:00

isa-bridge.c

…

kgdb.c

…

kprobes.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-01-07 11:31:52 -08:00

l2cr_6xx.S

…

legacy_serial.c

…

lparcfg.c

powerpc: Display processor virtualization resource allocs in lparcfg

2009-06-02 10:36:10 +10:00

machine_kexec_32.c

…

machine_kexec_64.c

powerpc/32: Setup OF properties for kdump

2008-12-23 15:13:29 +11:00

machine_kexec.c

powerpc: Allow mem=x cmdline to work with 4G+

2009-05-15 16:43:41 +10:00

Makefile

powerpc: Only build prom_init.o when CONFIG_PPC_OF_BOOT_TRAMPOLINE=y

2009-06-15 13:27:36 +10:00

misc_32.S

powerpc/44x: Support 16K/64K base page sizes on 44x

2008-12-29 09:53:25 +11:00

misc_64.S

powerpc: Move VMX and VSX asm code to vector.S

2009-06-09 16:46:25 +10:00

misc.S

…

module_32.c

…

module_64.c

powerpc: Unify opcode definitions and support

2009-02-23 10:48:56 +11:00

module.c

module: cleanup FIXME comments about trimming exception table entries.

2009-06-12 21:47:05 +09:30

msi.c

powerpc/PCI: include pci.h in powerpc MSI implementation

2009-03-25 08:54:29 -07:00

nvram_64.c

…

of_device.c

…

of_platform.c

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

paca.c

powerpc: Separate PACA fields for server CPUs

2009-06-09 16:47:38 +10:00

pci_32.c

powerpc/pci: Remove redundant pcnet32 fixup

2009-05-21 15:44:24 +10:00

pci_64.c

powerpc: Fix warning when printing a resource_size_t

2009-06-09 16:47:41 +10:00

pci_dn.c

powerpc/pci: Move pseries code into pseries platform specific area

2009-05-21 15:44:24 +10:00

pci-common.c

powerpc/pci: Fix annotation of pcibios_claim_one_bus

2009-06-02 11:09:12 +10:00

perf_counter.c

perf_counter: powerpc: Fix two compile warnings

2009-06-15 16:12:25 +02:00

pmc.c

…

power4-pmu.c

perf_counter: Rename L2 to LL cache

2009-06-11 17:54:17 +02:00

power5-pmu.c

perf_counter: Rename L2 to LL cache

2009-06-11 17:54:17 +02:00

power5+-pmu.c

perf_counter: Rename L2 to LL cache

2009-06-11 17:54:17 +02:00

power6-pmu.c

perf_counter: Rename L2 to LL cache

2009-06-11 17:54:17 +02:00

power7-pmu.c

powerpc, perf_counter: Fix performance counter event types

2009-06-12 14:21:11 +02:00

ppc32.h

…

ppc970-pmu.c

perf_counter: Rename L2 to LL cache

2009-06-11 17:54:17 +02:00

ppc_ksyms.c

powerpc: Export cacheable_memzero as its now used in a driver

2009-01-08 16:25:17 +11:00

ppc_save_regs.S

powerpc: Prepare xmon_save_regs for use with kdump

2008-12-23 15:13:28 +11:00

proc_ppc64.c

…

process.c

powerpc: Shield code specific to 64-bit server processors

2009-06-09 16:47:38 +10:00

prom_init_check.sh

powerpc: Print linux_banner in prom_init

2009-03-11 17:11:33 +11:00

prom_init.c

fbdev: move logo externs to header file

2009-06-16 19:47:57 -07:00

prom_parse.c

powerpc: Fix of_node_put() exit path in of_irq_map_one()

2009-04-20 12:18:43 -06:00

prom.c

powerpc: Shield code specific to 64-bit server processors

2009-06-09 16:47:38 +10:00

ptrace32.c

powerpc: Fix ptrace compat wrapper for FPU register access

2009-04-07 15:19:00 +10:00

ptrace.c

powerpc: Add PTRACE_SINGLEBLOCK support

2009-06-09 13:29:25 +10:00

reloc_64.S

…

rtas_flash.c

proc 2/2: remove struct proc_dir_entry::owner

2009-03-31 01:14:44 +04:00

rtas_pci.c

powerpc/pci: Clean up direct access to sysdata by RTAS

2009-05-21 15:44:23 +10:00

rtas-proc.c

…

rtas-rtc.c

…

rtas.c

powerpc/pseries: Fix partition migration hang under load

2009-02-23 15:53:04 +11:00

setup_32.c

powerpc: Add support for swiotlb on 32-bit

2009-06-09 16:49:18 +10:00

setup_64.c

powerpc: Fix warning in setup_64.c when CONFIG_RELOCATABLE=y

2009-06-15 13:26:21 +10:00

setup-common.c

powerpc: Remove duplicated #include's

2009-04-07 15:18:58 +10:00

setup.h

…

signal_32.c

powerpc: Sanitize stack pointer in signal handling code

2009-03-27 16:58:24 +11:00

signal_64.c

powerpc: Sanitize stack pointer in signal handling code

2009-03-27 16:58:24 +11:00

signal.c

powerpc: Sanitize stack pointer in signal handling code

2009-03-27 16:58:24 +11:00

signal.h

powerpc: Sanitize stack pointer in signal handling code

2009-03-27 16:58:24 +11:00

smp-tbsync.c

…

smp.c

Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-01-02 11:44:09 -08:00

softemu8xx.c

…

stacktrace.c

…

suspend.c

…

swsusp_32.S

powerpc/mm: Introduce MMU features

2008-12-21 14:21:16 +11:00

swsusp_64.c

…

swsusp_asm64.S

…

swsusp.c

powerpc/mm: Split mmu_context handling

2008-12-21 14:21:15 +11:00

sys_ppc32.c

…

syscalls.c

…

sysfs.c

powerpc: Fix bugs introduced by sysfs changes

2009-03-27 16:58:24 +11:00

systbl_chk.c

…

systbl_chk.sh

…

systbl.S

…

tau_6xx.c

…

time.c

powerpc: Don't do generic calibrate_delay()

2009-06-15 13:26:17 +10:00

traps.c

powerpc: Add PTRACE_SINGLEBLOCK support

2009-06-09 13:29:25 +10:00

udbg_16550.c

powerpc/udbg: Fix lost byte during console handover; change LFCR to CRLF

2009-03-11 17:11:34 +11:00

udbg.c

powerpc/udbg: Fix lost byte during console handover; change LFCR to CRLF

2009-03-11 17:11:34 +11:00

vdso.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2008-12-28 16:54:33 -08:00

vecemu.c

…

vector.S

powerpc: Move VMX and VSX asm code to vector.S

2009-06-09 16:46:25 +10:00

vio.c

workqueue: add to_delayed_work() helper function

2009-04-02 19:04:50 -07:00

vmlinux.lds.S

powerpc: Explicit alignment for .data.cacheline_aligned

2009-05-18 15:19:05 +10:00