summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-13 08:17:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-13 08:17:52 -0700
commitcec5455e457928153f5a51668dad3d68176feab5 (patch)
treebf62da1e26096c4cf97e56f8678269112dc306a1 /MAINTAINERS
parentb0cbc861a3c05e634520b049b5cc27ad6febb51f (diff)
parentc6375b0a8007fffe65109aeea032a9243df070e1 (diff)
downloadop-kernel-dev-cec5455e457928153f5a51668dad3d68176feab5.zip
op-kernel-dev-cec5455e457928153f5a51668dad3d68176feab5.tar.gz
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (60 commits) microblaze_v8: Add MAINTAINERS fragment microblaze_v8: Uartlite for Microblaze microblaze_v8: Makefiles for Microblaze cpu microblaze_v8: Kconfig patches microblaze_v8: Interrupt handling and timer support microblaze_v8: syscalls.h microblaze_v8: pci headers microblaze_v8: Kbuild file microblaze_v8: string.h thread_info.h microblaze_v8: unistd.h microblaze_v8: fcntl.h sockios.h ucontext.h microblaze_v8: pool.h socket.h microblaze_v8: device.h param.h topology.h microblaze_v8: headers files entry.h current.h mman.h registers.h sembuf.h microblaze_v8: namei.h microblaze_v8: gpio.h, serial.h microblaze_v8: headers simple files - empty or redirect to asm-generic microblaze_v8: sigcontext.h siginfo.h microblaze_v8: termbits.h termios.h microblaze_v8: stats headers ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5d84358..bff9f9f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2992,6 +2992,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
OpenPOWER on IntegriCloud