summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-06 00:59:56 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-06 00:59:56 +0100
commitf843b0fcc70094d87fea8c7004937388c316ea7a (patch)
tree00f76db04a4127a62fe1afe6d863d96d96e05226 /fs
parentMerge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux (diff)
parentASoC: fixup oops in generic AC97 codec glue (diff)
downloadlinux-f843b0fcc70094d87fea8c7004937388c316ea7a.tar.xz
linux-f843b0fcc70094d87fea8c7004937388c316ea7a.zip
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 'fs')
0 files changed, 0 insertions, 0 deletions