Huang, Tao bbf44583ac Merge branch 'torvalds/master' ...

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

Conflicts:
	arch/arm/include/asm/arm-cci.h
	drivers/android/binder.c
	drivers/android/binder_trace.h
	drivers/block/zram/Kconfig
	drivers/net/wireless/rockchip_wlan/esp8089/esp_premalloc/version.h
	include/kvm/arm_arch_timer.h
	include/linux/pl320-ipc.h
	include/linux/zsmalloc.h
	include/uapi/linux/android/binder.h

2015-11-11 19:52:00 +08:00

..

asm-offsets.h

score: add asm/asm-offsets.h wrapper

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

asmmacro.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

atomic.h

Disintegrate asm/system.h for Score

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

bitops.h

arch,score: Convert smp_mb__*()

2014-04-18 14:20:43 +02:00

bug.h

Disintegrate asm/system.h for Score

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

bugs.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

cache.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

cacheflush.h

score: add flush_dcahce_page and PG_dcache_dirty define

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

checksum.h

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

cmpxchg.h

arch: Remove __ARCH_HAVE_CMPXCHG

2015-05-13 10:55:42 +02:00

current.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

delay.h

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

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

device.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

div64.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

dma.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

elf.h

default SET_PERSONALITY() in linux/elf.h

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

emergency-restart.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

exec.h

Disintegrate asm/system.h for Score

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

fixmap.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

fncpy.h

asm-generic: fncpy: Add function copying macros

2013-11-21 13:39:20 +08:00

ftrace.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

futex.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

hardirq.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

hw_irq.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

io.h

rk: revert to v3.10

2015-11-11 15:57:28 +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

Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

2015-10-04 16:31:13 +01:00

kdebug.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

kmap_types.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

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

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

mmu_context.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

mmu.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

module.h

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

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

mutex.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

page.h

score: fixed pfn_valid define.

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

pci.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

percpu.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

pgalloc.h

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

pgtable-bits.h

score: drop _PAGE_FILE and pte_file()-related helpers

2015-02-10 14:30:33 -08:00

pgtable.h

mm: make FIRST_USER_ADDRESS unsigned long on all archs

2015-02-11 17:06:03 -08:00

processor.h

arch, locking: Ciao arch_mutex_cpu_relax()

2014-07-17 12:32:47 +02: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

scoreregs.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

segment.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

setup.h

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

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

shmparam.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

string.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

switch_to.h

sched, score: Remove finish_arch_switch()

2015-08-04 09:38:04 +02:00

syscalls.h

score: switch to generic sigaltstack

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

thread_info.h

arch: Remove exec_domain from remaining archs

2015-04-12 21:03:30 +02:00

timex.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

tlb.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

tlbflush.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

topology.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

uaccess.h

mm/uaccess, mm/fault: Clarify that uaccess may only sleep if pagefaults are enabled

2015-05-19 08:39:14 +02:00

ucontext.h

score: add missing #includes

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

unaligned.h

score: Add support for Sunplus S+core architecture

2009-06-19 11:38:47 +02:00

user.h

score: update inconsistent declare after .c was changed

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