Merge branch 'for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
commitf843b0fcc70094d87fea8c7004937388c316ea7a
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jan 2010 23:59:56 +0000 (5 15:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jan 2010 23:59:56 +0000 (5 15:59 -0800)
tree00f76db04a4127a62fe1afe6d863d96d96e05226
parentc5974b835a909ff15c3b7e6cf6789b5eb919f419
parentecbec242961ec66e900b5649ded1e40f5d5edc41
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