David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
internal.h	regmap: Allow installing custom reg_update_bits function	2015-10-06 16:12:34 +01:00
Kconfig	regmap: ac97: Add generic AC'97 callbacks	2014-11-19 10:28:14 +00:00
Makefile	regmap: Move tracing header into drivers/base/regmap	2015-03-19 22:22:45 +00:00
regcache-flat.c	regmap: cache: Sort include headers alphabetically	2014-10-20 12:25:06 +01:00
regcache-lzo.c	regmap: cache: Sort include headers alphabetically	2014-10-20 12:25:06 +01:00
regcache-rbtree.c	regmap: regcache-rbtree: Clean new present bits on present bitmap resize	2015-07-29 15:10:13 +01:00
regcache.c	regmap: Split use_single_rw internally into use_single_read/write	2015-08-21 09:33:10 -07:00
regmap-ac97.c	regmap: Move documentation to regmap.h	2015-08-11 17:21:44 +01:00
regmap-debugfs.c	regmap: debugfs: Don't bother actually printing when calculating max length	2015-09-19 07:38:12 -07:00
regmap-i2c.c	Merge remote-tracking branches 'regmap/topic/lockdep' and 'regmap/topic/seq-delay' into regmap-next	2015-09-04 17:22:10 +01:00
regmap-irq.c	regmap: Split use_single_rw internally into use_single_read/write	2015-08-21 09:33:10 -07:00
regmap-mmio.c	regmap: Move documentation to regmap.h	2015-08-11 17:21:44 +01:00
regmap-spi.c	regmap: Move documentation to regmap.h	2015-08-11 17:21:44 +01:00
regmap-spmi.c	regmap: Move documentation to regmap.h	2015-08-11 17:21:44 +01:00
regmap.c	regmap: Allow installing custom reg_update_bits function	2015-10-06 16:12:34 +01:00
trace.h	regmap: Move tracing header into drivers/base/regmap	2015-03-19 22:22:45 +00:00