diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 13:29:03 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2011-07-22 15:50:49 +0200 |
| commit | 18c7472ac8b504be5d1ead99a4ffc5af79b8090e (patch) | |
| tree | 200f36eb0f6de72e10ba42ae8987d8ce1fd37ec0 /drivers/mfd/ab5500-core.c | |
| parent | aadc220bdaa46ddc2facdf074d837953065fc6ab (diff) | |
hsi: ste_hsi: Fix merge problems merge with original commit.
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'drivers/mfd/ab5500-core.c')
0 files changed, 0 insertions, 0 deletions