Jiri Kosina e75d660672 Merge branch 'master' into for-next ...

Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c

2012-04-08 21:48:52 +02:00

..

cpufreq

MIPS: errloongson2_clock: Fix build error by including linux/module.h

2011-11-10 17:59:45 +00:00

.gitignore

…

8250-platform.c

mips: remove needless include of module.h from core kernel files.

2011-10-31 19:30:57 -04:00

asm-offsets.c

…

binfmt_elfn32.c

…

binfmt_elfo32.c

…

bmips_vec.S

MIPS: BMIPS: Add SMP support code for BMIPS43xx/BMIPS5000

2011-12-07 22:03:18 +00:00

branch.c

MIPS Kprobes: Refactor branch emulation

2011-12-07 22:04:03 +00:00

cevt-bcm1480.c

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

cevt-ds1287.c

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

cevt-gt641xx.c

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

cevt-r4k.c

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

cevt-sb1250.c

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

cevt-smtc.c

…

cevt-txx9.c

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

cpu-bugs64.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

cpu-probe.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

csrc-bcm1480.c

…

csrc-ioasic.c

…

csrc-powertv.c

…

csrc-r4k.c

…

csrc-sb1250.c

…

early_printk.c

…

entry.S

MIPS: Split do_syscall_trace into two functions.

2011-05-19 09:55:44 +01:00

ftrace.c

MIPS: Ftrace: Fix the CONFIG_DYNAMIC_FTRACE=n compile

2011-09-21 17:52:04 +02:00

genex.S

…

gpio_txx9.c

…

head.S

…

i8253.c

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

i8259.c

MIPS: i8259: Mark cascade interrupt non-threaded

2011-09-21 17:52:28 +02:00

init_task.c

mips: migrate core kernel file from module.h --> export.h

2011-10-31 19:30:56 -04:00

irq_cpu.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

irq_txx9.c

…

irq-gic.c

…

irq-gt641xx.c

…

irq-msc01.c

mips: remove needless include of module.h from core kernel files.

2011-10-31 19:30:57 -04:00

irq-rm7000.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

irq-rm9000.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

irq.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

jump_label.c

…

kgdb.c

…

kprobes.c

MIPS Kprobes: Support branch instructions probing

2011-12-07 22:04:03 +00:00

kspd.c

fs: Remove missed ->fds_bits from cessation use of fd_set structs internally

2012-02-24 14:04:50 +01:00

linux32.c

MIPS: Compat: Use 32-bit wrapper for compat_sys_futex.

2011-09-21 17:53:44 +02:00

machine_kexec.c

…

Makefile

Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next

2012-01-11 15:42:31 +01:00

mcount.S

…

mips_ksyms.c

mips: migrate core kernel file from module.h --> export.h

2011-10-31 19:30:56 -04:00

mips_machine.c

…

mips-mt-fpaff.c

remove references to cpu_*_map in arch/

2012-03-29 15:38:30 +10:30

mips-mt.c

Merge branch 'master' into for-next

2012-04-08 21:48:52 +02:00

module.c

mips: remove needless include of module.h from core kernel files.

2011-10-31 19:30:57 -04:00

octeon_switch.S

…

perf_event_mipsxx.c

perf: Disable PERF_SAMPLE_BRANCH_* when not supported

2012-03-05 14:55:42 +01:00

perf_event.c

MIPS: perf: Reorganize contents of perf support files.

2011-10-24 23:34:26 +01:00

proc.c

remove references to cpu_*_map in arch/

2012-03-29 15:38:30 +10:30

process.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

prom.c

irq_domain/mips: Allow irq_domain on MIPS

2012-02-24 09:47:23 -07:00

ptrace32.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

ptrace.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

r4k_fpu.S

…

r4k_switch.S

…

r2300_fpu.S

…

r2300_switch.S

…

r6000_fpu.S

…

relocate_kernel.S

…

reset.c

mips: migrate core kernel file from module.h --> export.h

2011-10-31 19:30:56 -04:00

rtlx.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

scall32-o32.S

MIPS: Hook up process_vm_readv and process_vm_writev system calls.

2011-11-09 00:07:56 +00:00

scall64-64.S

MIPS: Hook up process_vm_readv and process_vm_writev system calls.

2011-11-09 00:07:56 +00:00

scall64-n32.S

MIPS: Hook up process_vm_readv and process_vm_writev system calls.

2011-11-09 00:07:56 +00:00

scall64-o32.S

MIPS: Hook up process_vm_readv and process_vm_writev system calls.

2011-11-09 00:07:56 +00:00

setup.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

signal32.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

signal_n32.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

signal-common.h

…

signal.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

smp-bmips.c

remove references to cpu_*_map in arch/

2012-03-29 15:38:30 +10:30

smp-cmp.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

smp-mt.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

smp-up.c

…

smp.c

remove references to cpu_*_map in arch/

2012-03-29 15:38:30 +10:30

smtc-asm.S

…

smtc-proc.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

smtc.c

remove references to cpu_*_map in arch/

2012-03-29 15:38:30 +10:30

spinlock_test.c

mips: migrate core kernel file from module.h --> export.h

2011-10-31 19:30:56 -04:00

spram.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

stacktrace.c

mips: migrate core kernel file from module.h --> export.h

2011-10-31 19:30:56 -04:00

sync-r4k.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

syscall.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

time.c

mips: migrate core kernel file from module.h --> export.h

2011-10-31 19:30:56 -04:00

topology.c

…

traps.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

unaligned.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

vdso.c

coredump: remove VM_ALWAYSDUMP flag

2012-03-23 16:58:42 -07:00

vmlinux.lds.S

MIPS: vmlinux.lds.S: remove duplicate _sdata symbol

2012-02-20 18:33:18 +01:00

vpe.c

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

watch.c

…