From: Olof Johansson <olof@lixom.net>
Date: Sun, 2 Sep 2012 15:22:58 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas... 
X-Git-Tag: firefly_0821_release~3680^2~2123^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3729d4a41d1c706ecdfa2fb0bbf37d8ab73ec959;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes' of git://git./linux/kernel/git/horms/renesas into fixes

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: marzen: fixup smsc911x id for regulator
---

3729d4a41d1c706ecdfa2fb0bbf37d8ab73ec959