diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-21 06:42:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-21 06:42:24 -0400 |
| commit | a25606c845856e5ca5ed54d23cab077e3a49bf10 (patch) | |
| tree | 1721e46532d6f48d605d401d7cee83f78f551c45 /MAINTAINERS | |
| parent | 938b93adb2642885e688390396472d22a7548748 (diff) | |
| parent | 94833dfb8c98ed4ca1944dd2c1339d88a2d1c758 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c13408ccaf9c..27a17069106f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -871,7 +871,7 @@ P: Marcel Holtmann | |||
| 871 | M: marcel@holtmann.org | 871 | M: marcel@holtmann.org |
| 872 | P: Maxim Krasnyansky | 872 | P: Maxim Krasnyansky |
| 873 | M: maxk@qualcomm.com | 873 | M: maxk@qualcomm.com |
| 874 | L: bluez-devel@lists.sf.net | 874 | L: linux-bluetooth@vger.kernel.org |
| 875 | W: http://bluez.sf.net | 875 | W: http://bluez.sf.net |
| 876 | W: http://www.bluez.org | 876 | W: http://www.bluez.org |
| 877 | W: http://www.holtmann.org/linux/bluetooth/ | 877 | W: http://www.holtmann.org/linux/bluetooth/ |