tree bcc2d99831afd6b371748a60dc17ce550c33dd4b
parent 04368d051a6aa90c14a3ca5a48f60aca2f6ecdd1
parent 00b317a41c5428b13eb7e5b4bbc691b1aa7afa80
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1301836335 +0900
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1301836335 +0900

Merge branch 'for-2.6.39' into for-2.6.40