tree c0b6b398ae5acb694690f759e3a6e73673165d5c
parent 9c1be7e8cb1e33d4d7d4bed40466ee358fdf5a34
parent e827e32efc313e1a061c81007e96fff439ccb802
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1277905613 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1277905613 +0100

Merge remote branch 'takashi/topic/asoc' into for-2.6.36