diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 13:10:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 13:10:16 -0400 |
| commit | 2b6b6d385d2933c105e27f2d25fdb36d392d7f59 (patch) | |
| tree | 427187b324a627098e0da53f28a3dee8bda93988 /MAINTAINERS | |
| parent | 3e862dd5c94cc53ba6494804c7388303e3d25403 (diff) | |
| parent | 0a8c791437db4937bd160570f594d0286d3dd78d (diff) | |
Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Add missing FILE tag to MAINTAINERS
microblaze: remove duplicated #include's
microblaze: struct device - replace bus_id with dev_name()
microblaze: Simplify copy_thread()
microblaze: Add TIMESTAMPING constants to socket.h
microblaze: Add missing empty ftrace.h file
microblaze: Fix problem with removing zero length files
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 57969bf67b94..0cb20d821694 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3680,6 +3680,7 @@ L: microblaze-uclinux@itee.uq.edu.au | |||
| 3680 | W: http://www.monstr.eu/fdt/ | 3680 | W: http://www.monstr.eu/fdt/ |
| 3681 | T: git git://git.monstr.eu/linux-2.6-microblaze.git | 3681 | T: git git://git.monstr.eu/linux-2.6-microblaze.git |
| 3682 | S: Supported | 3682 | S: Supported |
| 3683 | F: arch/microblaze/ | ||
| 3683 | 3684 | ||
| 3684 | MICROTEK X6 SCANNER | 3685 | MICROTEK X6 SCANNER |
| 3685 | P: Oliver Neukum | 3686 | P: Oliver Neukum |