| commit | d5ed5e48f4a6333cde05c5235b88a8a94e72afe8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 21 18:29:05 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 21 18:29:05 2011 -0800 |
| tree | 270824153a912b24b6402ad7e18658b54be4a643 | |
| parent | 0703c680f62cb210fecf24684cc1c6a70c26c899 [diff] | |
| parent | 8015e3defe491d305b20c2e64b154b999e6da065 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: atmel/ac97c: using software reset instead hardware reset if not available