Merge branch 'pxa2xx-i2s' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 14 May 2009 19:35:51 +0000 (20:35 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 14 May 2009 19:35:51 +0000 (20:35 +0100)
commitc13cb78ace34ef9e4cfa2a2fae9a7772d90d6ace
treeec347add163ca9383c76bb3685f989e57fc2d7b0
parentd34c43078236b41146877c49af341ab85b5fb8db
parent916465a841937a60baac6144ae3f41b0d1560f3b
Merge branch 'pxa2xx-i2s' into for-2.6.31