Merge branch 'fixes' into next

This commit is contained in:
Vinod Koul 2012-06-14 11:20:31 +05:30
commit 0a0760358c