Merge branch 'for-2.6.31' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Jun 2009 12:58:37 +0000 (13:58 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Jun 2009 12:58:37 +0000 (13:58 +0100)
commitd5fc3b5fe374f24b6773c22e90ef4bdda718b845
tree3d8f2cfe059e418ad7eb37ababbc2f2cafe213c6
parente2f551dacbdff8e40365a989ab66104b03316f4d
parentdd5e8e6b1d4c218d2bafe002231ec460459ab5c4
Merge branch 'for-2.6.31' into for-2.6.32
sound/soc/codecs/wm8903.c
sound/soc/pxa/magician.c
sound/soc/soc-core.c