commit | 3729d4a41d1c706ecdfa2fb0bbf37d8ab73ec959 | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Sun Sep 02 08:22:58 2012 -0700 |
committer | Olof Johansson <olof@lixom.net> | Sun Sep 02 08:22:58 2012 -0700 |
tree | dc3e74bc96c71b163fd15558efaa9c16e6d84fae | |
parent | 3800bd392ffc70cb699fbd06734ae9aabea97979 [diff] | |
parent | 497dcf6fc355f0734faf851662b6957386715d24 [diff] |
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