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	kbuild: move asm-offsets.h to include/generated	2009-12-12 13:08:14 +01:00
axisflashmap.h
bitops.h	CRIS: use generic atomic bitops	2015-03-25 10:55:35 +01:00
bug.h
bugs.h
cache.h
cacheflush.h
checksum.h
current.h
delay.h
dma-mapping.h	remove <asm/scatterlist.h>	2015-05-05 13:35:39 -06:00
dma.h
eshlibld.h	CRIS: Drop code related to obsolete or unused kconfigs	2015-11-02 20:03:05 +01:00
etraxi2c.h
fasttimer.h
fb.h
fncpy.h	asm-generic: fncpy: Add function copying macros	2013-11-21 13:39:20 +08:00
ftrace.h
hw_irq.h
io.h	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
irq.h
irqflags.h	Fix IRQ flag handling naming	2010-10-07 14:08:55 +01: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.h
mmu_context.h	CRIS: fix switch_mm() lockdep splat	2015-09-05 00:56:50 +02:00
mutex.h
page.h	mm/CRIS: clean up unused VALID_PAGE()	2013-07-03 16:07:39 -07:00
pci.h	remove <asm/scatterlist.h>	2015-05-05 13:35:39 -06:00
pgalloc.h	cris: handle pgtable_page_ctor() fail	2013-11-15 09:32:17 +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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-20 18:05:28 -08:00
segment.h
serial.h	cris: add arch/cris/include/asm/serial.h	2011-08-25 16:25:35 -07:00
shmparam.h
signal.h	cris: switch to generic old sigaction()	2013-02-03 18:15:53 -05:00
stacktrace.h	CRIS: add STACKTRACE_SUPPORT	2015-09-05 00:56:50 +02:00
string.h
swab.h	UAPI: (Scripted) Disintegrate arch/cris/include/asm	2012-10-09 09:46:45 +01:00
switch_to.h	Disintegrate asm/system.h for CRIS	2012-03-28 18:30:02 +01:00
termios.h	UAPI: (Scripted) Disintegrate arch/cris/include/asm	2012-10-09 09:46:45 +01: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	CRIS: remove SMP code	2015-03-25 10:55:10 +01:00
uaccess.h	CRIS: Whitespace cleanup	2015-02-14 18:54:12 +01:00
ucontext.h
unaligned.h
unistd.h	CRIS: Wire up missing syscalls	2015-09-05 00:33:25 +02:00
user.h