Mark Brown 38e23194e1 Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next ...

Conflicts (trivial context stuff):
	drivers/base/regmap/regmap.c
	include/linux/regmap.h

2012-07-22 19:26:07 +01:00

..

internal.h

…

Kconfig

…

Makefile

…

regcache-lzo.c

…

regcache-rbtree.c

…

regcache.c

…

regmap-debugfs.c

…

regmap-i2c.c

…

regmap-irq.c

Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next

2012-07-22 19:26:07 +01:00

regmap-mmio.c

…

regmap-spi.c

…

regmap.c

Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next

2012-07-22 19:26:07 +01:00