Merge branch 'for-2.6.30' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 14 Apr 2009 12:22:37 +0000 (13:22 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 14 Apr 2009 12:22:37 +0000 (13:22 +0100)
commit6967963d6d5cac40a091d075326f0e3ccb95c58a
treea9c29ac6450a7d1dc815f9d97f726ecd59271812
parent9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038
parent34e51ce60a210094bd66cf0a75dd8512247618ca
Merge branch 'for-2.6.30' into for-2.6.31
sound/soc/pxa/pxa-ssp.c