diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-06-16 12:47:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-06-16 12:48:21 +0200 |
| commit | 0b2d71175990629f11189f5df98cc0c26ae61993 (patch) | |
| tree | 838029b09d5dac48768b54001fe74e476cddd344 /drivers/bcma | |
| parent | cf8a471909dd6a0df3efe2586cab5323184b4a7d (diff) | |
| parent | 145c0e914d2cd0cf829b8c4cbe24736b3ee81a91 (diff) | |
Merge branch 'for-linus' into for-next
Yet another non-trivial conflicts for HDA legacy stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/bcma')
0 files changed, 0 insertions, 0 deletions