diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-02 01:15:02 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-02 01:15:02 +0400 |
| commit | ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8 (patch) | |
| tree | 3ca115b6580b70b20d21da179f004b14f54edc8e /drivers/regulator/aat2870-regulator.c | |
| parent | 17a505edb09495510ac8998450980472c412455b (diff) | |
| parent | 9cf1c871526cf6bfec2a653e1e068ee72592542c (diff) | |
| download | linux-ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8.tar.xz | |
Merge branch 'next/cleanup' into HEAD
Conflicts:
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/w1/masters/omap_hdq.c
Diffstat (limited to 'drivers/regulator/aat2870-regulator.c')
0 files changed, 0 insertions, 0 deletions