diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:29 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:29 +0800 |
| commit | 1bf9f29a05ed027dfc3527966321bda33a77ebc3 (patch) | |
| tree | 05c97c420ca49515051196ffc52716e8f5702a97 /arch/mn10300/unit-asb2305/pci.c | |
| parent | ddaaeee0e598aa98b2e6a1847003c78665714926 (diff) | |
| parent | f9911803e82a32c126c40dd6246ade2faf472cbc (diff) | |
| parent | 3c9390ad0fa642f42e437feae1c75bdd21e8e1bc (diff) | |
| parent | e46c93669349072f5caca853f5618cfa01b86008 (diff) | |
| parent | a37f1b8fdc912600c24f9d0d45d7046e50a031e4 (diff) | |
| parent | b8255930e0fbda841890ff6bb7154aa5fd62e143 (diff) | |
Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sta32x', 'asoc/topic/tdm-slot', 'asoc/topic/tegra' and 'asoc/topic/tlv320aic3x' into asoc-next