| commit | 8654844cf51d434dad5d4d9f48dc99d1ac89aad7 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Tue Jun 09 07:22:26 2015 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Tue Jun 09 07:22:26 2015 +0200 |
| tree | ce1ad2eb865c6f5e15b4f7f119e05e439d675a53 | |
| parent | 01ec65c812ef829c815d2f37a97cc4eb7925f8ae [diff] | |
| parent | 132bd96bc56f9cafd24b71de389984d0e83a0956 [diff] |
Merge branch 'for-linus' into for-next Resolve the non-trivial conflict due to the hdac regmap API changes. Signed-off-by: Takashi Iwai <tiwai@suse.de>