Merge branch 'MAINTAINERS-update' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Sat, 27 Apr 2013 12:48:57 +0000 (20:48 +0800)
committerZhang Rui <rui.zhang@intel.com>
Sat, 27 Apr 2013 12:48:57 +0000 (20:48 +0800)

Trivial merge