diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-12 20:14:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-12 20:14:20 -0500 |
| commit | 1c32ca9f63d2a103dd33eae72e5aff53a23fe650 (patch) | |
| tree | 327640f35da4215ea67d03f08b798ef9d0e38ba5 /MAINTAINERS | |
| parent | 00dad7fa99701f5ca83b9f598d1c36c9523bbbf7 (diff) | |
| parent | 94fb7c9c5d40edd538d7f2e048af5ab9ff55ef73 (diff) | |
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (38 commits)
Revert "staging: tidspbridge: replace iommu custom for opensource implementation"
Revert "staging: tidspbridge - move shared memory iommu maps to tiomap3430.c"
Revert "staging: tidspbridge - rename bridge_brd_mem_map/unmap to a proper name"
Revert "staging: tidspbridge - remove custom mmu code from tiomap3430.c"
Revert "staging: tidspbridge - fix mmufault support"
Revert "staging: tidspbridge - remove hw directory"
Revert "staging: tidspbridge - move all iommu related code to a new file"
Revert "staging: tidspbridge: remove dw_dmmu_base from cfg_hostres struct"
Revert "staging: tidspbridge - remove reserved memory clean up"
Revert "staging: tidspbridge - deprecate reserve/unreserve_memory funtions"
Revert "staging: tidspbridge - remove dmm custom module"
Revert "staging: tidspbridge - update Kconfig to select IOMMU module"
staging: tidspbridge: hardcode SCM macros while fix is upstreamed
Staging: keucr driver: fix uninitialized variable & proper memset length
omap: dsp: remove shm from normal memory
Staging: wlan-ng: Fix wrong #ifdef #endif sequence
Staging: Update parameters for cfg80211 key management operation
Staging: ath6kl: Fix pointer casts on 64-bit architectures
Staging: batman-adv: suppress false warning when changing the mac address
Staging: batman-adv: fix interface alternating and bonding reggression
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1b1954dc087d..88b74a75d932 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5676,7 +5676,7 @@ S: Maintained | |||
| 5676 | 5676 | ||
| 5677 | STAGING SUBSYSTEM | 5677 | STAGING SUBSYSTEM |
| 5678 | M: Greg Kroah-Hartman <gregkh@suse.de> | 5678 | M: Greg Kroah-Hartman <gregkh@suse.de> |
| 5679 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git | 5679 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git |
| 5680 | L: devel@driverdev.osuosl.org | 5680 | L: devel@driverdev.osuosl.org |
| 5681 | S: Maintained | 5681 | S: Maintained |
| 5682 | F: drivers/staging/ | 5682 | F: drivers/staging/ |