Merge branch 'for-2.6.30' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Apr 2009 11:45:40 +0000 (12:45 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Apr 2009 11:45:40 +0000 (12:45 +0100)
commit9b5b0c01598f9782690b09ce6c49f4ba116dde44
treedc8f4f66ed75f0b4843619362e088618e160847c
parent7154b3e80203ee91f9ba7d0a43d3daa05c49d9e9
parentb08f7a62cafd7998862072a1c353219e3d84bbef
Merge branch 'for-2.6.30' into for-2.6.31
sound/soc/omap/n810.c
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-pcm.c
sound/soc/pxa/pxa-ssp.c