tree dc3e74bc96c71b163fd15558efaa9c16e6d84fae
parent 3800bd392ffc70cb699fbd06734ae9aabea97979
parent 497dcf6fc355f0734faf851662b6957386715d24
author Olof Johansson <olof@lixom.net> 1346599378 -0700
committer Olof Johansson <olof@lixom.net> 1346599378 -0700

Merge branch 'fixes' of git://git.kernel.org/pub/scm/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