From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Jan 2010 23:59:56 +0000 (-0800)
Subject: Merge branch 'for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v2.6.33-rc3~4
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=f843b0fcc70094d87fea8c7004937388c316ea7a

Merge branch 'for-2.6.33' of git://git./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
---

f843b0fcc70094d87fea8c7004937388c316ea7a