diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-05 15:59:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-05 15:59:56 -0800 |
| commit | f843b0fcc70094d87fea8c7004937388c316ea7a (patch) | |
| tree | 00f76db04a4127a62fe1afe6d863d96d96e05226 /arch/x86/include/asm/alternative.h | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
| parent | ecbec242961ec66e900b5649ded1e40f5d5edc41 (diff) | |
Merge branch 'for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6
* 'for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6:
ASoC: fixup oops in generic AC97 codec glue
ASoC: fix params_rate() macro use in several codecs
ASoC: fsi-ak4642: Remove ak4642_add_i2c_device
Diffstat (limited to 'arch/x86/include/asm/alternative.h')
0 files changed, 0 insertions, 0 deletions