| commit | 990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Thu Mar 08 09:33:44 2012 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Thu Mar 08 09:33:44 2012 -0800 |
| tree | b0f6c896749f5beca20d74e72e4761aaa9e8ad2b | |
| parent | 3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c [diff] | |
| parent | 8a16a701ad787b6db2949766341c5ad1b551de9f [diff] |
Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers * 'regulator' of git://github.com/hzhuang1/linux: (2 commits) regulator: Remove bq24022 regulator driver pxa: magician/hx4700: Convert to gpio-regulator from bq24022 (plus update to v3.3-rc6)