Merge branch 'topic/of' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Wed, 14 Aug 2013 08:25:04 +0000 (13:55 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 14 Aug 2013 08:25:04 +0000 (13:55 +0530)

Trivial merge