diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-03 16:33:39 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-03 16:33:39 +0100 |
| commit | 7020d7697178afbb3fe579edb99afb05211e4bf1 (patch) | |
| tree | f4e89438e3de2abebe009f3a2f79c3e501c260ee /drivers/acpi/osl.c | |
| parent | 1fc84503130927fae0b5e2f753f07a7192793223 (diff) | |
| parent | 365a7bb32e097a8501a6a70b9225abcb09924f8c (diff) | |
| parent | 2be01d29f8555d5afe0c7c4bea6b306b0c31f17f (diff) | |
| parent | f7477c2be8689ee8355db345f107744c9bd7f112 (diff) | |
| parent | a31083600476ac11b656bbc70784767f231469ff (diff) | |
Merge remote-tracking branches 'spi/topic/davinci', 'spi/topic/doc', 'spi/topic/dw' and 'spi/topic/fsl' into spi-next