diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-23 13:38:11 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-23 13:38:11 +0100 |
commit | d89ccac5a242a6547bcb8073f1ff65bdfa042266 (patch) | |
tree | 7e0203a2af342ccb2638a8ccc8ab55948654955c /sound/soc/pxa/pxa-ssp.c | |
parent | 72fba57931c703ad71849b2521226c9bcb7d6688 (diff) | |
parent | 70bf043b137aa9ff2711b16532774465e07a8f47 (diff) | |
download | talos-obmc-linux-d89ccac5a242a6547bcb8073f1ff65bdfa042266.tar.gz talos-obmc-linux-d89ccac5a242a6547bcb8073f1ff65bdfa042266.zip |
Merge branch 'for-2.6.36' into for-2.6.37
Diffstat (limited to 'sound/soc/pxa/pxa-ssp.c')
0 files changed, 0 insertions, 0 deletions