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
asmmacro.h
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
cache.h
cacheflush.h
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
delay.h
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
fncpy.h	asm-generic: fncpy: Add function copying macros	2013-11-21 13:39:20 +08:00
ftrace.h
futex.h
hardirq.h
hw_irq.h
io.h	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
irq.h
irq_regs.h
irqflags.h
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
kmap_types.h
linkage.h
local.h
local64.h
mmu.h
mmu_context.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
pci.h
percpu.h
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
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	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
tlb.h
tlbflush.h
topology.h
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
unaligned.h
user.h