Merge tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc stmp-dev library code from Olof Johansson:
 "A number of devices are using a common register layout, this adds
  support code for it in lib/stmp_device.c so we do not need to
  duplicate it in each driver."

Fix up trivial conflicts in drivers/i2c/busses/i2c-mxs.c and
lib/Makefile

* tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  i2c: mxs: use global reset function
  lib: add support for stmp-style devices

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/busses/i2c-mxs.c
index 7fa73eed84a7b695ed4fd45fda8b2cb9ee303182,083480241945f1ab78ede986adcd0a7d4f5b348c..58a338846f065daade5edadecf5e1b68f7aef565
--- 1/drivers/i2c/busses/i2c-mxs.c
--- 2/drivers/i2c/busses/i2c-mxs.c
+++ b/drivers/i2c/busses/i2c-mxs.c
@@@ -26,9 -26,7 +26,8 @@@
  #include <linux/platform_device.h>
  #include <linux/jiffies.h>
  #include <linux/io.h>
- 
- #include <mach/common.h>
 +#include <linux/pinctrl/consumer.h>
+ #include <linux/stmp_device.h>
  
  #define DRIVER_NAME "mxs-i2c"
  

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
index b98df505f335de2e6562c3196d72f924f57f7f10,f78dbcdc7e3da93a9d076bdf9e834ffa38c28d1e..2a1d7f9d39a2349f7adce9413436ebe4fc583577
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -123,10 -123,8 +123,12 @@@ obj-$(CONFIG_SIGNATURE) += digsig.
  
  obj-$(CONFIG_CLZ_TAB) += clz_tab.o
  
 +obj-$(CONFIG_DDR) += jedec_ddr_data.o
 +
 +obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o
 +
+ obj-$(CONFIG_STMP_DEVICE) += stmp_device.o
+ 
  hostprogs-y   := gen_crc32table
  clean-files   := crc32table.h