Ingo Molnar d0303d71c2 Merge branch 'linus' into perf/core ...

Conflicts:
	arch/sparc/kernel/perf_event.c

Merge reason: Resolve the conflict.

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

2010-09-23 08:02:09 +02:00

..

.gitignore

…

apc.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

asm-offsets.c

…

audit.c

…

auxio_32.c

…

auxio_64.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

btext.c

…

central.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

cherrs.S

…

chmc.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

compat_audit.c

…

cpu.c

…

cpumap.c

…

cpumap.h

…

devices.c

…

dma.c

…

ds.c

…

dtlb_miss.S

…

dtlb_prot.S

…

ebus.c

…

entry.h

…

entry.S

…

etrap_32.S

…

etrap_64.S

…

fpu_traps.S

…

ftrace.c

…

getsetcc.S

…

head_32.S

…

head_64.S

…

helpers.S

sparc64: Fix perf_arch_get_caller_regs().

2010-08-08 22:07:36 -07:00

hvapi.c

…

hvcalls.S

…

hvtramp.S

…

idprom.c

…

init_task.c

…

iommu_common.h

…

iommu.c

…

ioport.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

irq_32.c

…

irq_64.c

…

irq.h

…

itlb_miss.S

…

ivec.S

…

kernel.h

…

kgdb_32.c

…

kgdb_64.c

…

kprobes.c

…

kstack.h

…

ktlb.S

…

ldc.c

…

led.c

…

leon_kernel.c

…

leon_smp.c

…

Makefile

…

mdesc.c

lmb: rename to memblock

2010-07-14 17:14:00 +10:00

misctrap.S

…

module.c

…

muldiv.c

…

nmi.c

…

of_device_32.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

of_device_64.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

of_device_common.c

of: make of_find_device_by_node generic

2010-07-24 09:58:22 -06:00

of_device_common.h

…

pci_common.c

…

pci_fire.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

pci_impl.h

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

pci_msi.c

…

pci_psycho.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

pci_sabre.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

pci_schizo.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

pci_sun4v_asm.S

…

pci_sun4v.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

pci_sun4v.h

…

pci.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

pcic.c

…

pcr.c

…

perf_event.c

Merge branch 'linus' into perf/core

2010-09-23 08:02:09 +02:00

pmc.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

power.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

process_32.c

Make do_execve() take a const filename pointer

2010-08-17 18:07:43 -07:00

process_64.c

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

2010-08-28 13:55:31 -07:00

prom_32.c

…

prom_64.c

Merge commit 'v2.6.35-rc6' into devicetree/next

2010-07-24 09:49:13 -06:00

prom_common.c

of/sparc: move is_root_node() to of.h

2010-07-14 17:08:03 -06:00

prom_irqtrans.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

prom.h

of/sparc: move is_root_node() to of.h

2010-07-14 17:08:03 -06:00

psycho_common.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

psycho_common.h

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

ptrace_32.c

…

ptrace_64.c

…

reboot.c

…

rtrap_32.S

…

rtrap_64.S

…

sbus.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

setup_32.c

…

setup_64.c

…

signal32.c

sparc: Prevent no-handler signal syscall restart recursion.

2010-09-21 22:30:13 -07:00

signal_32.c

sparc: Prevent no-handler signal syscall restart recursion.

2010-09-21 22:30:13 -07:00

signal_64.c

sparc: Prevent no-handler signal syscall restart recursion.

2010-09-21 22:30:13 -07:00

smp_32.c

…

smp_64.c

…

sparc_ksyms_32.c

…

sparc_ksyms_64.c

…

spiterrs.S

…

sstate.c

…

stacktrace.c

…

starfire.c

…

sun4c_irq.c

…

sun4d_irq.c

…

sun4d_smp.c

…

sun4m_irq.c

…

sun4m_smp.c

…

sun4v_ivec.S

…

sun4v_tlb_miss.S

…

sys32.S

sparc: Hook up new fanotify and prlimit64 syscalls.

2010-08-16 15:04:29 -07:00

sys_sparc32.c

Mark arguments to certain syscalls as being const

2010-08-13 16:53:13 -07:00

sys_sparc_32.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

2010-09-11 08:01:09 -07:00

sys_sparc_64.c

Make do_execve() take a const filename pointer

2010-08-17 18:07:43 -07:00

syscalls.S

…

sysfs.c

…

systbls_32.S

sparc: Hook up new fanotify and prlimit64 syscalls.

2010-08-16 15:04:29 -07:00

systbls_64.S

sparc: Hook up new fanotify and prlimit64 syscalls.

2010-08-16 15:04:29 -07:00

systbls.h

…

tadpole.c

…

tick14.c

…

time_32.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

time_64.c

sparc: remove references to of_device and to_of_device

2010-07-24 09:58:22 -06:00

trampoline_32.S

…

trampoline_64.S

…

traps_32.c

…

traps_64.c

…

tsb.S

…

ttable.S

sparc64: fix the build error due to smp_kgdb_capture_client()

2010-06-25 11:17:57 -07:00

una_asm_32.S

…

una_asm_64.S

…

unaligned_32.c

sparc: Kill all BKL usage.

2010-09-08 20:57:59 -07:00

unaligned_64.c

…

us2e_cpufreq.c

…

us3_cpufreq.c

…

utrap.S

…

vio.c

…

viohs.c

…

visemul.c

…

vmlinux.lds.S

…

windows.c

sparc: Kill all BKL usage.

2010-09-08 20:57:59 -07:00

winfixup.S

…

wof.S

…

wuf.S

…