Merge remote-tracking branch 'origin/master' into percpu
authorZaafar Ahmed <zaafar.tahir@gmail.com>
Wed, 30 Mar 2016 13:13:48 +0000 (18:13 +0500)
committerZaafar Ahmed <zaafar.tahir@gmail.com>
Wed, 30 Mar 2016 13:13:48 +0000 (18:13 +0500)

Trivial merge