Ingo Molnar 37bf06375c Merge tag 'v3.12-rc4' into sched/core ...

Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree
before applying more scheduler patches.

Conflicts:
	arch/avr32/include/asm/Kbuild

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2013-10-09 12:36:13 +02:00

..

asm-offsets.h

score: add asm/asm-offsets.h wrapper

2009-12-12 13:08:16 +01:00

asmmacro.h

…

atomic.h

Disintegrate asm/system.h for Score

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

barrier.h

Disintegrate asm/system.h for Score

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

bitops.h

Disintegrate asm/system.h for Score

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

bug.h

Disintegrate asm/system.h for Score

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

bugs.h

…

cache.h

…

cacheflush.h

score: add flush_dcahce_page and PG_dcache_dirty define

2009-12-17 18:28:31 +08:00

checksum.h

Score: Implement the function csum_ipv6_magic

2013-09-26 03:46:03 +08:00

cmpxchg.h

Disintegrate asm/system.h for Score

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

cputime.h

…

current.h

…

delay.h

score: include asm-generic/param.h in asm/delay.h.

2009-12-17 18:31:23 +08:00

device.h

…

div64.h

…

dma.h

…

elf.h

default SET_PERSONALITY() in linux/elf.h

2013-02-26 02:46:08 -05:00

emergency-restart.h

…

exec.h

Disintegrate asm/system.h for Score

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

fixmap.h

…

ftrace.h

…

futex.h

…

hardirq.h

…

hw_irq.h

…

io.h

Score: The commit is for compiling successfully.

2013-09-26 03:46:03 +08:00

irq_regs.h

score: update inconsistent declare after .c was changed

2009-08-30 12:30:16 +08:00

irq.h

score: update inconsistent declare after .c was changed

2009-08-30 12:30:16 +08:00

irqflags.h

score: lost a semicolon in asm/irqflags.h

2011-03-28 12:02:20 +08:00

Kbuild

sched, arch: Create asm/preempt.h

2013-09-25 14:07:50 +02:00

kdebug.h

…

kmap_types.h

…

linkage.h

score: update inconsistent declare after .c was changed

2009-08-30 12:30:16 +08:00

local64.h

arch: Implement local64_t

2010-06-09 11:12:36 +02:00

local.h

…

mmu_context.h

…

mmu.h

…

module.h

Make most arch asm/module.h files use asm-generic/module.h

2012-09-28 14:31:03 +09:30

mutex.h

…

page.h

score: fixed pfn_valid define.

2009-12-17 18:28:31 +08:00

pci.h

…

percpu.h

…

pgalloc.h

Score: The commit is for compiling successfully.

2013-09-26 03:46:03 +08:00

pgtable-bits.h

…

pgtable.h

consolidate io_remap_pfn_range definitions

2013-06-29 12:46:35 +04:00

processor.h

score: switch to generic kernel_thread()/kernel_execve()

2012-10-15 16:12:06 -04:00

ptrace.h

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

2012-12-20 18:05:28 -08:00

scatterlist.h

remove needless ISA_DMA_THRESHOLD

2010-08-07 18:15:50 +02:00

scoreregs.h

…

sections.h

…

segment.h

…

setup.h

UAPI: (Scripted) Disintegrate arch/score/include/asm

2012-12-20 10:55:33 +00:00

shmparam.h

…

string.h

…

switch_to.h

Disintegrate asm/system.h for Score

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

syscalls.h

score: switch to generic sigaltstack

2013-02-03 18:16:15 -05:00

thread_info.h

sanitize tsk_is_polling()

2012-10-01 09:58:13 -04:00

timex.h

…

tlb.h

…

tlbflush.h

…

topology.h

…

uaccess.h

score: update inconsistent declare after .c was changed

2009-08-30 12:30:16 +08:00

ucontext.h

score: add missing #includes

2009-06-27 15:09:46 +02:00

unaligned.h

…

user.h

score: update inconsistent declare after .c was changed

2009-08-30 12:30:16 +08:00