Merge branch 'fixes_for-3.6' into fixes
authorVinod Koul <vinod.koul@linux.intel.com>
Mon, 6 Aug 2012 05:16:37 +0000 (10:46 +0530)
committerVinod Koul <vinod.koul@linux.intel.com>
Mon, 6 Aug 2012 05:16:37 +0000 (10:46 +0530)

Trivial merge