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

..

bitops

OpenRISC: Headers

2011-07-22 18:46:39 +02:00

asm-offsets.h

OpenRISC: Headers

2011-07-22 18:46:39 +02:00

bitops.h

arch,openrisc: Convert smp_mb__*()

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

cache.h

OpenRISC: Memory management

2011-07-22 18:46:28 +02:00

cpuinfo.h

OpenRISC: Headers

2011-07-22 18:46:39 +02:00

delay.h

OpenRISC: Headers

2011-07-22 18:46:39 +02:00

dma-mapping.h

dma-mapping: consolidate dma_set_mask

2015-09-10 13:29:01 -07:00

elf.h

default SET_PERSONALITY() in linux/elf.h

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

fixmap.h

OpenRISC: Memory management

2011-07-22 18:46:28 +02:00

fncpy.h

asm-generic: fncpy: Add function copying macros

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

gpio.h

gpiolib/arches: Centralise bolierplate asm/gpio.h

2012-05-11 18:00:14 -06:00

io.h

asm-generic/io.h: remove asm/cacheflush.h include

2012-10-25 16:06:57 +02:00

irq.h

openrisc: Get rid of handle_IRQ

2014-09-03 13:11:02 +00:00

irqflags.h

OpenRISC: IRQ

2011-07-22 18:46:33 +02:00

Kbuild

mm: clean up per architecture MM hook header files

2015-07-17 16:39:53 -07:00

linkage.h

OpenRISC: Headers

2011-07-22 18:46:39 +02:00

mmu_context.h

OpenRISC: Memory management

2011-07-22 18:46:28 +02:00

mmu.h

OpenRISC: Memory management

2011-07-22 18:46:28 +02:00

mutex.h

OpenRISC: Headers

2011-07-22 18:46:39 +02:00

page.h

OpenRISC: Remove memory_start/end prototypes

2012-03-06 10:37:21 +01:00

pgalloc.h

openrisc: add missing pgtable_page_ctor/dtor calls

2013-11-15 09:32:16 +09: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

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

2012-10-09 09:47:18 +01:00

serial.h

OpenRISC: Headers

2011-07-22 18:46:39 +02:00

spinlock.h

OpenRISC: Headers

2011-07-22 18:46:39 +02:00

spr_defs.h

OpenRISC: Headers

2011-07-22 18:46:39 +02:00

spr.h

OpenRISC: Headers

2011-07-22 18:46:39 +02:00

syscall.h

ARCH: AUDIT: implement syscall_get_arch for all arches

2014-09-23 16:20:10 -04:00

syscalls.h

openrisc: switch to use of generic fork and clone

2012-11-28 23:43:40 -05:00

thread_info.h

arch: Remove exec_domain from remaining archs

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

timex.h

OpenRISC: Timekeeping

2011-07-22 18:46:32 +02:00

tlb.h

OpenRISC: Memory management

2011-07-22 18:46:28 +02:00

tlbflush.h

OpenRISC: Memory management

2011-07-22 18:46:28 +02:00

uaccess.h

openrisc/uaccess: fix sparse errors

2015-01-13 15:23:17 +02:00

unaligned.h

OpenRISC: Headers

2011-07-22 18:46:39 +02:00