diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-20 19:44:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-20 19:44:00 -0500 |
| commit | 6ab33d51713d6d60c7677c0d020910a8cb37e513 (patch) | |
| tree | 546c2ff099b2757e75cf34ddace874f1220f740e /MAINTAINERS | |
| parent | 7be6065b39c3f1cfa796667eac1a2170465acc91 (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
include/net/mac80211.h
net/phonet/af_phonet.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b85cd25759a0..ecfcc24113c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1804,7 +1804,7 @@ S: Maintained | |||
| 1804 | 1804 | ||
| 1805 | FTRACE | 1805 | FTRACE |
| 1806 | P: Steven Rostedt | 1806 | P: Steven Rostedt |
| 1807 | M: srostedt@redhat.com | 1807 | M: rostedt@goodmis.org |
| 1808 | S: Maintained | 1808 | S: Maintained |
| 1809 | 1809 | ||
| 1810 | FUJITSU FR-V (FRV) PORT | 1810 | FUJITSU FR-V (FRV) PORT |