diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-24 12:55:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-24 12:55:18 -0400 |
| commit | ff0c4ad2c3a75ccfe6adca916e50804eb45bb2d9 (patch) | |
| tree | 574f2d38793f7a08af73c40a96d6dc76af9c6f46 /MAINTAINERS | |
| parent | fcda12e7f6d58d61997681a9d41779e3fd2ffc94 (diff) | |
| parent | 19f9d392365113f74286b1721c7c032c12cf5abd (diff) | |
Merge branch 'for-upstream' of git://openrisc.net/jonas/linux
* 'for-upstream' of git://openrisc.net/jonas/linux: (24 commits)
OpenRISC: Add MAINTAINERS entry
OpenRISC: Miscellaneous
OpenRISC: Library routines
OpenRISC: Headers
OpenRISC: Traps
OpenRISC: Module support
OpenRISC: GPIO
OpenRISC: Scheduling/Process management
OpenRISC: Idle/Power management
OpenRISC: System calls
OpenRISC: IRQ
OpenRISC: Timekeeping
OpenRISC: DMA
OpenRISC: PTrace
OpenRISC: Build infrastructure
OpenRISC: Signal handling
OpenRISC: Memory management
OpenRISC: Device tree
OpenRISC: Boot code
iomap: make IOPORT/PCI mapping functions conditional
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 63524a09ca86..43392c9ef4c3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4688,6 +4688,14 @@ F: drivers/of | |||
| 4688 | F: include/linux/of*.h | 4688 | F: include/linux/of*.h |
| 4689 | K: of_get_property | 4689 | K: of_get_property |
| 4690 | 4690 | ||
| 4691 | OPENRISC ARCHITECTURE | ||
| 4692 | M: Jonas Bonn <jonas@southpole.se> | ||
| 4693 | W: http://openrisc.net | ||
| 4694 | L: linux@lists.openrisc.net | ||
| 4695 | S: Maintained | ||
| 4696 | T: git git://openrisc.net/~jonas/linux | ||
| 4697 | F: arch/openrisc | ||
| 4698 | |||
| 4691 | OPL4 DRIVER | 4699 | OPL4 DRIVER |
| 4692 | M: Clemens Ladisch <clemens@ladisch.de> | 4700 | M: Clemens Ladisch <clemens@ladisch.de> |
| 4693 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 4701 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |