diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 19:52:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 19:52:17 -0400 |
| commit | f7e801172c53c4dc48b1f888a72eae069be6333a (patch) | |
| tree | 61d5243a48fe3640dbace0222054fc88dd0c6612 /MAINTAINERS | |
| parent | 092f4c56c1927e4b61a41ee8055005f1cb437009 (diff) | |
| parent | 6b1c70b1ff6f800f081a6bbef662789135f7b398 (diff) | |
Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
MAINTAINERS: Update entry for IA64
[IA64] gpio: GENERIC_GPIO default must be n
[IA64[ add CONFIG_NET_VENDOR_INTEL=y to default config files where needed
[IA64] agp/hp-agp: Allow binding user memory to the AGP GART
[IA64] sn2: add missing put_cpu()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 479beaa39131..7f21e31996e2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3205,8 +3205,7 @@ IA64 (Itanium) PLATFORM | |||
| 3205 | M: Tony Luck <tony.luck@intel.com> | 3205 | M: Tony Luck <tony.luck@intel.com> |
| 3206 | M: Fenghua Yu <fenghua.yu@intel.com> | 3206 | M: Fenghua Yu <fenghua.yu@intel.com> |
| 3207 | L: linux-ia64@vger.kernel.org | 3207 | L: linux-ia64@vger.kernel.org |
| 3208 | W: http://www.ia64-linux.org/ | 3208 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git |
| 3209 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git | ||
| 3210 | S: Maintained | 3209 | S: Maintained |
| 3211 | F: arch/ia64/ | 3210 | F: arch/ia64/ |
| 3212 | 3211 | ||