Merge tag 'non-critical-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 14:30:05 +0000 (16:30 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 14:30:05 +0000 (16:30 +0200)
From Kukjin Kim:

update MAINTAINER
- Add exynos filename match to ARM/S5P EXYNOS ARM ARCHITECTURES

* tag 'non-critical-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  MAINTAINERS: Add exynos filename match to ARM/S5P EXYNOS ARM ARCHITECTURES

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge