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

..

a.out-core.h

…

a.out.h

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

2012-12-17 14:12:19 +00:00

agp_backend.h

…

agp.h

…

asm-offsets.h

…

atomic.h

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

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

barrier.h

arch: Cleanup read_barrier_depends() and comments

2014-12-11 21:15:05 -05:00

bitops.h

arch,alpha: Convert smp_mb__*() to the asm-generic primitives

2014-04-18 11:40:31 +02:00

bug.h

…

bugs.h

…

cache.h

…

cacheflush.h

…

checksum.h

…

cmpxchg.h

arch: Remove __ARCH_HAVE_CMPXCHG

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

compiler.h

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

2012-12-17 14:12:19 +00:00

console.h

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

2012-12-17 14:12:19 +00:00

core_apecs.h

…

core_cia.h

…

core_irongate.h

…

core_lca.h

Disintegrate asm/system.h for Alpha

2012-03-28 18:11:12 +01:00

core_marvel.h

…

core_mcpcia.h

Disintegrate asm/system.h for Alpha

2012-03-28 18:11:12 +01:00

core_polaris.h

…

core_t2.h

Disintegrate asm/system.h for Alpha

2012-03-28 18:11:12 +01:00

core_titan.h

…

core_tsunami.h

…

core_wildfire.h

…

current.h

…

delay.h

…

device.h

…

div64.h

…

dma-mapping.h

dma-mapping: consolidate dma_set_mask

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

dma.h

…

elf.h

Disintegrate asm/system.h for Alpha

2012-03-28 18:11:12 +01:00

emergency-restart.h

…

err_common.h

…

err_ev6.h

…

err_ev7.h

…

fb.h

…

floppy.h

alpha: irq: remove deprecated use of IRQF_DISABLED

2013-04-07 12:59:30 -07:00

fncpy.h

asm-generic: fncpy: Add function copying macros

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

fpu.h

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

2012-12-17 14:12:19 +00:00

ftrace.h

…

futex.h

alpha: fix 32/64-bit bug in futex support

2012-03-05 15:49:43 -08:00

gct.h

…

gpio.h

gpiolib/arches: Centralise bolierplate asm/gpio.h

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

hardirq.h

…

hw_irq.h

…

hwrpb.h

…

io_trivial.h

…

io.h

alpha: io: define ioremap_uc

2015-09-17 21:16:07 -07:00

irq_regs.h

…

irq.h

…

irqflags.h

Disintegrate asm/system.h for Alpha

2012-03-28 18:11:12 +01:00

jensen.h

…

Kbuild

mm: clean up per architecture MM hook header files

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

kdebug.h

…

kmap_types.h

…

linkage.h

consolidate cond_syscall and SYSCALL_ALIAS declarations

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

local64.h

…

local.h

…

machvec.h

alpha: Reorganize rtc handling

2013-11-16 16:33:16 -08:00

mc146818rtc.h

…

mce.h

Disintegrate asm/system.h for Alpha

2012-03-28 18:11:12 +01:00

mmu_context.h

Disintegrate asm/system.h for Alpha

2012-03-28 18:11:12 +01:00

mmu.h

…

mmzone.h

mm/ALPHA: clean up unused VALID_PAGE()

2013-07-03 16:07:39 -07: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

…

page.h

…

pal.h

alpha: Use qemu+cserve provided high-res clock and alarm.

2013-11-16 16:33:21 -08:00

param.h

alpha: Force the user-visible HZ to a constant 1024.

2013-07-19 13:54:26 -07:00

parport.h

ALPHA: drivers: remove __dev* attributes.

2013-01-03 15:57:13 -08:00

pci.h

Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block

2015-06-25 15:22:36 -07:00

percpu.h

…

perf_event.h

…

pgalloc.h

alpha: handle pgtable_page_ctor() fail

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

alpha: forward declare struct pt_regs in processor.h

2015-04-17 09:03:53 -04:00

ptrace.h

alpha: Enable system-call auditing support.

2014-01-31 09:21:55 -08:00

rtc.h

alpha: Reorganize rtc handling

2013-11-16 16:33:16 -08:00

rwsem.h

…

segment.h

…

serial.h

serial: 8250: remove Kconfig indirection

2015-05-06 22:27:00 +02:00

sfp-machine.h

…

shmparam.h

…

signal.h

consolidate kernel-side struct sigaction declarations

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

smp.h

…

socket.h

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

2012-12-17 14:12:19 +00:00

special_insns.h

Disintegrate asm/system.h for Alpha

2012-03-28 18:11:12 +01:00

spinlock_types.h

…

spinlock.h

alpha: select CONFIG_ARCH_USE_CMPXCHG_LOCKREF.

2015-08-30 18:01:16 -07:00

string.h

alpha: Eliminate compiler warning from memset macro

2013-11-16 16:33:09 -08:00

switch_to.h

Disintegrate asm/system.h for Alpha

2012-03-28 18:11:12 +01:00

syscall.h

Alpha: define syscall_get_arch()

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

termios.h

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

2012-12-17 14:12:19 +00: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

…

types.h

alpha: Remove #include <uapi/asm/types.h> from <asm/types.h>

2015-05-26 10:01:45 -07:00

uaccess.h

alpha: macro whitespace fixes

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

ucontext.h

…

unaligned.h

…

unistd.h

alpha: Wire up all missing implemented syscalls

2015-05-26 10:01:50 -07:00

user.h

…

vga.h

…

word-at-a-time.h

word-at-a-time.h: support zero_bytemask() on alpha and tile

2015-10-06 14:53:16 -04:00

wrperfmon.h

…

xchg.h

alpha: fix build failures from system.h dismemberment

2012-04-13 13:15:16 -04:00

xor.h

…