| commit | 10121a12e2380fb34b6e646a8e367add06d036c3 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Thu Jun 25 15:28:14 2009 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Thu Jun 25 15:28:14 2009 +0200 |
| tree | d500294174e67cbb208eaf5d7f9741be48eca8a6 | |
| parent | 28d0325ce6e0a52f53d8af687e6427fee59004d3 [diff] | |
| parent | dd5e8e6b1d4c218d2bafe002231ec460459ab5c4 [diff] |
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc Conflicts: MAINTAINERS