Jiri Kosina e75d660672 Merge branch 'master' into for-next ... Merge with latest Linus' tree, as I have incoming patches that fix code that is newer than current HEAD of for-next. Conflicts: drivers/net/ethernet/realtek/r8169.c		2012-04-08 21:48:52 +02:00
..
masters	w1: Use linux/gpio.h rather than asm/gpio.h	2012-02-09 08:36:05 -08:00
slaves	DS2781 Maxim Stand-Alone Fuel Gauge battery and w1 slave drivers	2012-03-08 11:15:33 -08:00
Kconfig	trivial: Kconfig: .ko is normally not included in module names	2009-06-12 18:01:50 +02:00
Makefile
w1_family.c	drivers/w1: Add export.h for EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:32:00 -04:00
w1_family.h	DS2781 Maxim Stand-Alone Fuel Gauge battery and w1 slave drivers	2012-03-08 11:15:33 -08:00
w1_int.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
w1_int.h	MAINTAINERS: Evgeniy has moved	2011-08-25 16:25:33 -07:00
w1_io.c	w1: disable irqs in critical section	2011-11-02 16:07:03 -07:00
w1_log.h	MAINTAINERS: Evgeniy has moved	2011-08-25 16:25:33 -07:00
w1_netlink.c	MAINTAINERS: Evgeniy has moved	2011-08-25 16:25:33 -07:00
w1_netlink.h	MAINTAINERS: Evgeniy has moved	2011-08-25 16:25:33 -07:00
w1.c	w1: fix slave driver registration error message	2012-04-03 03:38:14 +02:00
w1.h	MAINTAINERS: Evgeniy has moved	2011-08-25 16:25:33 -07:00