Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74d15418 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:
	drivers/net/wireless/iwmc3200wifi/netdev.c
	net/wireless/scan.c
parents 5a6338db ffafa60d

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de 
D: The Linux Support Team Erlangen



N: Andreas Koensgen

E: ajk@iehk.rwth-aachen.de

E: ajk@comnets.uni-bremen.de

D: 6pack driver for AX.25



N: Harald Koerfgen

Documentation/connector/cn_test.c

+2 −2
Original line number Diff line number Diff line 
/*

 * 	cn_test.c

 * 

 * 2004-2005 Copyright (c) Evgeniy Polyakov <johnpol@2ka.mipt.ru>

 * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>

 * All rights reserved.

 * 

 * This program is free software; you can redistribute it and/or modify
@@ -197,5 +197,5 @@ module_init(cn_test_init); 
module_exit(cn_test_fini);



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");

MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");

MODULE_DESCRIPTION("Connector's test module");

Documentation/connector/ucon.c

+1 −1
Original line number Diff line number Diff line 
/*

 * 	ucon.c

 *

 * Copyright (c) 2004+ Evgeniy Polyakov <johnpol@2ka.mipt.ru>

 * Copyright (c) 2004+ Evgeniy Polyakov <zbr@ioremap.net>

 *

 *

 * This program is free software; you can redistribute it and/or modify

Documentation/networking/6pack.txt

+1 −1
Original line number Diff line number Diff line 
This is the 6pack-mini-HOWTO, written by



Andreas Könsgen DG3KQ

Internet: ajk@iehk.rwth-aachen.de

Internet: ajk@comnets.uni-bremen.de

AMPR-net: dg3kq@db0pra.ampr.org

AX.25:    dg3kq@db0ach.#nrw.deu.eu

MAINTAINERS

+8 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ F: drivers/scsi/53c700* 


6PACK NETWORK DRIVER FOR AX.25

P:	Andreas Koensgen

M:	ajk@iehk.rwth-aachen.de

M:	ajk@comnets.uni-bremen.de

L:	linux-hams@vger.kernel.org

S:	Maintained

F:	drivers/net/hamradio/6pack.c
@@ -1612,6 +1612,13 @@ S: Supported 
F:	fs/configfs/

F:	include/linux/configfs.h



CONNECTOR

P:	Evgeniy Polyakov

M:	zbr@ioremap.net

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/connector/



CONTROL GROUPS (CGROUPS)

P:	Paul Menage

M:	menage@google.com
@@ -5584,7 +5591,6 @@ S: Odd Fixes 
F:	drivers/net/starfire*



STARMODE RADIO IP (STRIP) PROTOCOL DRIVER

W:	http://mosquitonet.Stanford.EDU/strip.html

S:	Orphan

F:	drivers/net/wireless/strip.c

F:	include/linux/if_strip.h