Merge branch 'for-2.6.30' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 16 Apr 2009 13:14:35 +0000 (14:14 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 16 Apr 2009 13:14:35 +0000 (14:14 +0100)
commit8d98f2246d7c622198ae0b8ca66f1c82b8a25377
tree6e1dd0347aadc121f6933f070bffd34bb3b33f70
parent3ba191ce051a32b20757f063120496e860ea8f9d
parent002fbad829883a3ad9b185077f9e54c37dc7502d
Merge branch 'for-2.6.30' into for-2.6.31
sound/soc/omap/omap-mcbsp.c
sound/soc/pxa/pxa-ssp.c