Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Jan 2011 13:22:14 +0000 (13:22 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Jan 2011 13:22:14 +0000 (13:22 +0000)
commit1166f985d3b6b4ef8a48a13f56520870d86085c3
tree4dbf63fcf70480ff10298482b53660af6e00be16
parentdddf3e4c257879bc35cda3f542507c43f2648a2a
parente9cf7049330cd44c8af43b0c5c7bef25a086c5b7
Merge branch 'for-2.6.38' into for-2.6.39
sound/soc/soc-dapm.c