diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:05:58 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:06:34 -0700 |
| commit | 828496eb80e97b7dbd4921ad64b1799ba2e5dd5b (patch) | |
| tree | 3accafab470e063df54a08bde52a6062e562d467 /drivers/leds/leds-lm3530.c | |
| parent | a25960e811a1aa56814deed47e257c1cddc90084 (diff) | |
| parent | 9ccd6e0d99208ca9a7bb514cc956b1de6800940b (diff) | |
| download | olio-linux-3.10-828496eb80e97b7dbd4921ad64b1799ba2e5dd5b.tar.xz olio-linux-3.10-828496eb80e97b7dbd4921ad64b1799ba2e5dd5b.zip | |
Merge branch 'mindtribe_dev' into android-3.10-bringup
Conflicts:
arch/arm/boot/dts/omap3_h1.dts
drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_trigger.c
Both resolved.
Change-Id: I42c070961bff246b07179dcaae1fc784dddb0328
Diffstat (limited to 'drivers/leds/leds-lm3530.c')
0 files changed, 0 insertions, 0 deletions