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)
commit3729d4a41d1c706ecdfa2fb0bbf37d8ab73ec959
treedc3e74bc96c71b163fd15558efaa9c16e6d84fae
parent3800bd392ffc70cb699fbd06734ae9aabea97979
parent497dcf6fc355f0734faf851662b6957386715d24
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