From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 May 2012 19:50:04 +0000 (-0700)
Subject: Merge tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.5-rc1~70
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39b6cc668c5ecc66f6f9c9293ffab681cb6f7065;p=pandora-kernel.git

Merge tag 'stmp-dev' of git://git./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
---

39b6cc668c5ecc66f6f9c9293ffab681cb6f7065
Reading git-diff-tree failed