Merge branch 'next' into for-linus-3.0
authorVinod Koul <vinod.koul@intel.com>
Wed, 27 Jul 2011 15:13:21 +0000 (20:43 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 27 Jul 2011 15:13:21 +0000 (20:43 +0530)

Trivial merge