diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-27 16:37:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-27 16:37:21 +0000 |
| commit | 85cfe6b64d785b170367322d9d130a530db7b276 (patch) | |
| tree | 729b102a1cd53dd1d0fd02cb193bc98b8f2162ac /drivers/acpi/acpica/utdebug.c | |
| parent | 5d79e9ac89b45643c98b68ea7ce62c80b3b4e160 (diff) | |
| parent | 53063ec6e2cc38000f98a5de557b7e4fed186cfc (diff) | |
Merge remote-tracking branch 'spi/fix/rspi' into spi-rcar
Conflicts (removal of an error handling fix due to devm conversion):
drivers/spi/spi-rspi.c
Diffstat (limited to 'drivers/acpi/acpica/utdebug.c')
0 files changed, 0 insertions, 0 deletions