Merge branch 's6000' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Apr 2009 17:51:34 +0000 (18:51 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Apr 2009 17:51:34 +0000 (18:51 +0100)
commit299a75920379e75069b5c8ef9954408f2085f051
tree1403cc3a8ae5d31477be76c030b8bdb9007b17a3
parent5409fb4e327a84972483047ecf4fb41f279453e2
parent80fbe6ac9b47cbc11e174a9bf853834dc281da35
Merge branch 's6000' into for-2.6.31