Merge branch 'for-linus' into next
authorVinod Koul <vinod.koul@intel.com>
Thu, 31 Oct 2013 17:06:13 +0000 (22:36 +0530)
committerVinod Koul <vinod.koul@intel.com>
Thu, 31 Oct 2013 17:06:13 +0000 (22:36 +0530)

Trivial merge