diff --git a/[refs] b/[refs] index 09ef101aca17..412979592d41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4286c2b08c1a24fcb96503a3fb43e69cb1ae0410 +refs/heads/master: c6375b0a8007fffe65109aeea032a9243df070e1 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 5d460c9d1c2c..7bfeed12a64c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2943,6 +2943,14 @@ L: linux-mtd@lists.infradead.org T: git git://git.infradead.org/mtd-2.6.git S: Maintained +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