Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)
commit5448716ba966307d518d5c6fd52a9de5e7108e26
treeb1c444f0e479a2ea71d0bef72e5bc750219fa252
parenta3cd50deef7ba7df506af5347764a00b4621d7a7
parent4bfc4e2508234f9149fd33fae853e99fb9e4a75b
Merge branch 'for-2.6.38' into for-2.6.39
sound/soc/pxa/tosa.c
sound/soc/pxa/zylonite.c