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
..
boot	FRV: Don't objcopy the GNU build_id note	2012-11-02 13:20:42 +00:00
include	Merge branch 'torvalds/master'	2015-11-11 19:52:00 +08:00
kernel	frv: Rewrite atomic implementation	2015-07-27 14:06:23 +02:00
lib	frv: Rewrite atomic implementation	2015-07-27 14:06:23 +02:00
mb93090-mb00	PCI: Revert "PCI: Call pci_read_bridge_bases() from core instead of arch code"	2015-09-15 13:18:04 -05:00
mm	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
defconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Kconfig	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
Kconfig.debug	consolidate per-arch stack overflow debugging options	2013-07-04 11:25:39 -07:00
Makefile	frv: Remove redundant debugging info flag	2014-01-28 10:57:24 +01:00