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

Hexagon: Add processor and system headers

2011-11-01 07:34:18 -07:00

atomic.h

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

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

bitops.h

arch,hexagon: Convert smp_mb__*()

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

cache.h

Hexagon: set ARCH_DMA_MINALIGN

2014-12-16 13:27:30 -06:00

cacheflush.h

hexagon: Fix build failures in linux-next

2014-12-16 13:27:12 -06:00

checksum.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

cmpxchg.h

arch: Remove __ARCH_HAVE_CMPXCHG

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

delay.h

arch: hexagon: kernel: add export symbol function __delay()

2014-04-04 18:19:59 -05:00

dma-mapping.h

dma-mapping: consolidate dma_set_mask

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

dma.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

elf.h

Hexagon: update CR year for elf.h

2014-04-04 18:20:02 -05:00

exec.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

fixmap.h

hexagon: use generic fixmap.h

2014-01-23 16:36:54 -08:00

fncpy.h

asm-generic: fncpy: Add function copying macros

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

fpu.h

Hexagon: Core arch-specific header files

2011-11-01 07:34:18 -07:00

futex.h

Hexagon: Core arch-specific header files

2011-11-01 07:34:18 -07:00

hexagon_vm.h

arch: hexagon: include: asm: add prefix "hvm[ci]_" for all enum members in "hexagon_vm.h"

2014-04-04 18:20:00 -05:00

intrinsics.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

io.h

hexagon: Fix build failures in linux-next

2014-12-16 13:27:12 -06:00

irq.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

irqflags.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05: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

kgdb.h

hexagon: include: asm: kgdb: extend DBG_MAX_REG_NUM for "cs0/1"

2014-04-04 18:19:59 -05:00

linkage.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

mem-layout.h

Hexagon: use correct translation for VMALLOC_START

2013-04-30 19:40:29 -05:00

mmu_context.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

mmu.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

module.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

mutex.h

Hexagon: Add generic headers

2011-11-01 07:34:18 -07:00

page.h

Hexagon: use correct translations for DMA mappings

2013-04-30 19:40:28 -05:00

perf_event.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

pgalloc.h

hexagon: correct type on pgd copy

2014-04-04 18:20:01 -05: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

smp.h

smp, hexagon: kill SMP single function call interrupt

2014-04-04 18:20:01 -05:00

spinlock_types.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

spinlock.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

string.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

suspend.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

switch_to.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

syscall.h

take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h

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

thread_info.h

arch: Remove exec_domain from remaining archs

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

time.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

timer-regs.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

timex.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

tlb.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

tlbflush.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

traps.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05: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

vdso.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

vm_fault.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

vm_mmu.h

Hexagon: update copyright dates

2013-04-30 19:40:27 -05:00