Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas...
authorOlof Johansson <olof@lixom.net>
Sun, 2 Sep 2012 15:22:58 +0000 (08:22 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 2 Sep 2012 15:22:58 +0000 (08:22 -0700)
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: marzen: fixup smsc911x id for regulator


Trivial merge