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

xtensa: fixes for configs without loop option

2015-11-02 18:02:47 +03:00

atomic.h

atomic, arch: Audit atomic_{read,set}()

2015-09-23 09:54:28 +02:00

barrier.h

arch,xtensa: Convert smp_mb__*()

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

bitops.h

arch,xtensa: Convert smp_mb__*()

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

bootparam.h

xtensa: split bootparam and kernel meminfo

2014-04-02 01:35:51 +04:00

bugs.h

…

cache.h

…

cacheasm.h

xtensa: fix build for configs without cache options

2015-11-02 18:02:51 +03:00

cacheflush.h

xtensa: support DMA to high memory

2015-11-09 01:25:37 +03:00

checksum.h

xtensa: add missing include asm/uaccess.h to checksum.h

2013-02-23 19:23:13 -08:00

cmpxchg.h

xtensa: implement fake NMI

2015-08-17 07:33:39 +03:00

coprocessor.h

…

current.h

xtensa: clean up files to make them code-style compliant

2012-12-18 21:10:25 -08:00

delay.h

xtensa: implement ndelay

2014-01-15 00:28:11 +04:00

device.h

xtensa: reimplement DMA API using common helpers

2015-08-17 07:31:00 +03:00

dma-mapping.h

xtensa: implement dma_to_phys and phys_to_dma

2015-11-09 01:25:38 +03:00

dma.h

…

elf.h

xtensa: add support for TLS

2013-02-23 19:35:57 -08:00

fb.h

…

fixmap.h

xtensa: support aliasing cache in k[un]map_atomic

2014-08-14 11:59:21 +04:00

flat.h

…

fncpy.h

asm-generic: fncpy: Add function copying macros

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

ftrace.h

rk: revert to v3.10

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

futex.h

xtensa: implement robust futex atomic uaccess ops

2014-01-14 10:19:51 -08:00

gpio.h

…

highmem.h

xtensa: fix kmap_prot definition

2014-12-09 03:22:57 +03:00

hw_irq.h

…

initialize_mmu.h

xtensa: fix build for configs without cache options

2015-11-02 18:02:51 +03:00

io.h

xtensa: nommu: provide correct KIO addresses

2015-11-02 18:03:02 +03:00

irq.h

xtensa: implement CPU hotplug

2014-01-14 10:19:59 -08:00

irqflags.h

xtensa: implement fake NMI

2015-08-17 07:33:39 +03: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

mmu_context.h

xtensa: nommu: move init_mmu stub to nommu_context.h

2014-10-21 13:28:44 +04:00

mmu.h

xtensa: add SMP support

2014-01-14 10:19:58 -08:00

module.h

…

mutex.h

…

mxregs.h

xtensa: add MX irqchip

2014-01-14 10:19:58 -08:00

nommu_context.h

xtensa: nommu: move init_mmu stub to nommu_context.h

2014-10-21 13:28:44 +04:00

page.h

xtensa: nommu: clean up memory map dump

2014-10-21 13:28:58 +04:00

param.h

…

pci-bridge.h

xtensa: clean up files to make them code-style compliant

2012-12-18 21:10:25 -08:00

pci.h

remove <asm/scatterlist.h>

2015-05-05 13:35:39 -06:00

perf_event.h

xtensa: enable HAVE_PERF_EVENTS

2014-01-15 00:27:03 +04:00

pgalloc.h

xtensa: use buddy allocator for PTE table

2013-11-15 09:32:19 +09:00

pgtable.h

rk: revert to v3.10

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

platform.h

xtensa: remove unused platform_init_irq()

2013-06-05 10:14:20 -07:00

processor.h

xtensa: implement fake NMI

2015-08-17 07:33:39 +03:00

ptrace.h

xtensa: add SMP support

2014-01-14 10:19:58 -08:00

regs.h

xtensa: keep a3 and excsave1 on entry to exception handlers

2013-09-06 09:47:41 -07:00

rwsem.h

…

segment.h

…

serial.h

…

shmparam.h

…

signal.h

consolidate kernel-side struct sigaction declarations

2013-02-03 15:09:22 -05:00

smp.h

xtensa: implement CPU hotplug

2014-01-14 10:19:59 -08:00

spinlock_types.h

xtensa: fix arch spinlock function names

2014-01-14 10:19:53 -08:00

spinlock.h

xtensa: fix arch spinlock function names

2014-01-14 10:19:53 -08:00

stacktrace.h

xtensa: move oprofile stack tracing to stacktrace.c

2015-08-17 07:32:49 +03:00

string.h

xtensa: fix str[n]cmp return value

2013-02-23 19:22:31 -08:00

switch_to.h

…

syscall.h

xtensa: switch to generic sigaltstack

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

sysmem.h

xtensa: keep sysmem banks ordered in add_sysmem_bank

2014-04-02 01:35:52 +04:00

thread_info.h

xtensa: Remove signal translation and exec_domain

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

timex.h

xtensa: add SMP support

2014-01-14 10:19:58 -08:00

tlb.h

…

tlbflush.h

xtensa: optimize local_flush_tlb_kernel_range

2014-04-06 21:29:17 +04:00

traps.h

rk: revert to v3.10

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

types.h

…

uaccess.h

rk: revert to v3.10

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

ucontext.h

…

unaligned.h

…

unistd.h

consolidate cond_syscall and SYSCALL_ALIAS declarations

2013-03-03 22:55:19 -05:00

user.h

…

vectors.h

xtensa: drop unused sections and remapped reset handlers

2015-11-03 17:19:39 +03:00

vga.h

…