Merge tag 'davinci-for-v4.7/doc' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Mon, 9 May 2016 14:09:24 +0000 (16:09 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 9 May 2016 14:09:24 +0000 (16:09 +0200)
Merge "DaVinci documentation update for v4.7" from Sekhar Nori:

MAINTAINERS file update to fix some stale entries.

* tag 'davinci-for-v4.7/doc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  MAINTAINERS: fix stale TI DaVinci entries

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge