android_kernel_oneplus_msm8998/drivers/w1
Alex Shi 5f87c475f8 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
	in fs/proc/task_mmu.c:
	looks like vma_get_anon_name() want have a name for anonymous
	vma when there is no name used in vma. commit: 586278d78b
	The name show is after any other names, so it maybe covered.
	but anyway, it just a show here.
2016-09-20 15:18:54 +08:00
..
masters Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2016-09-20 15:18:54 +08:00
slaves power: bq27xxx_battery: Platform initialization must declare a device 2015-09-23 16:23:12 +02:00
Kconfig Kconfig: replace "--- help ---" with "---help---" 2012-05-07 15:01:22 +02:00
Makefile
w1.c w1: introduce an ability to specify microseconds bus scanning intervals 2015-05-24 12:08:59 -07:00
w1.h w1: optional bundling of netlink kernel replies 2014-05-27 13:56:21 -07:00
w1_family.c w1: use pr_* instead of printk 2014-06-19 17:46:51 -07:00
w1_family.h w1: support auto-load of w1_bq27000 module. 2014-11-26 19:09:02 -08:00
w1_int.c drivers/w1/w1_int.c: call put_device if device_register fails 2015-10-05 04:47:09 +01:00
w1_int.h
w1_io.c w1: format for DocBook and fixes 2014-02-07 15:40:18 -08:00
w1_log.h w1: use pr_* instead of printk 2014-06-19 17:46:51 -07:00
w1_netlink.c w1: avoid potential u16 overflow 2014-11-26 19:09:01 -08:00
w1_netlink.h w1: optional bundling of netlink kernel replies 2014-05-27 13:56:21 -07:00