| commit | d71f4cece4bd97d05592836202fc04ff2e7817e3 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Thu May 20 12:00:43 2010 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Thu May 20 12:00:43 2010 +0200 |
| tree | 6c877c7a938758b1323d9c97d46b9c536e618c69 | |
| parent | 19008bdacb9f7841166ebafe0aef361ee582ffbf [diff] | |
| parent | ad8332c1302bcb4f80d593fd3eb477be9d7f5604 [diff] |
Merge branch 'topic/asoc' into for-linus Conflicts: sound/soc/codecs/ad1938.c