From: Linus Torvalds Date: Mon, 13 Apr 2009 15:23:46 +0000 (-0700) Subject: Merge branch 'gm_20090410' of git://repo.or.cz/linux-2.6/trivial-mods X-Git-Tag: v2.6.30-rc2~80 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3ab02a7c51fcbceafe999a515cc8bc4f0d0cfee;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge branch 'gm_20090410' of git://repo.or.cz/linux-2.6/trivial-mods * 'gm_20090410' of git://repo.or.cz/linux-2.6/trivial-mods: MAINTAINERS - Update MN10300 patterns MAINTAINERS - Update frv arch patterns scripts/get_maintainer.pl - Allow multiple files on command line MAINTAINERS - Update Freescale sound patterns MAINTAINERS - Add additional patterns MAINTAINERS - Add missing "/" to some pattern directories MAINTAINERS - Update DRIVER CORE patterns MAINTAINERS - Update M68K patterns MAINTAINERS - Coalesce sections "DVB" and "Video for Linux" MAINTAINERS - Remove cyblafb frame buffer no longer in tree MAINTAINERS - Remove x86/Voyager no longer in tree MAINTAINERS - Update FPU Emulator contact address and web page MAINTAINERS - i2c_tiny_usb T: should be W: MAINTAINERS - Add Linus Torvalds' git MAINTAINERS - standardize "T: git urls" MAINTAINERS - Remove HP Fibre Channel HBA no longer in tree MAINTAINERS - Standardize style MAINTAINERS - Add file patterns Add scripts/get_maintainer.pl Acked-by: Pavel Machek Acked-by: Andrew Morton --- d3ab02a7c51fcbceafe999a515cc8bc4f0d0cfee diff --cc MAINTAINERS index bff9f9f,ad3febb..ca2997a --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2991,15 -3669,10 +3669,18 @@@ W: http://www.linux-mtd.infradead.org L: linux-mtd@lists.infradead.org T: git git://git.infradead.org/mtd-2.6.git S: Maintained + F: drivers/mtd/ + F: include/linux/mtd/ + F: include/mtd/ +MICROBLAZE ARCHITECTURE +P: Michal Simek +M: monstr@monstr.eu +L: microblaze-uclinux@itee.uq.edu.au +W: http://www.monstr.eu/fdt/ +T: git git://git.monstr.eu/linux-2.6-microblaze.git +S: Supported + MICROTEK X6 SCANNER P: Oliver Neukum M: oliver@neukum.name