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

This commit is contained in:
David S. Miller 2011-08-07 23:20:26 -07:00
commit 19fd61785a
710 changed files with 18518 additions and 11564 deletions

View file

@ -1,8 +1,6 @@
#
# Makefile for the NetLabel subsystem.
#
# Feb 9, 2006, Paul Moore <[email protected]>
#
# base objects
obj-y := netlabel_user.o netlabel_kapi.o

View file

@ -6,7 +6,7 @@
* system manages static and dynamic label mappings for network protocols such
* as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -6,7 +6,7 @@
* system manages static and dynamic label mappings for network protocols such
* as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -6,7 +6,7 @@
* system manages static and dynamic label mappings for network protocols such
* as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -6,7 +6,7 @@
* system manages static and dynamic label mappings for network protocols such
* as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -5,7 +5,7 @@
* system manages static and dynamic label mappings for network protocols such
* as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -5,7 +5,7 @@
* NetLabel system. The NetLabel system manages static and dynamic label
* mappings for network protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -5,7 +5,7 @@
* NetLabel system. The NetLabel system manages static and dynamic label
* mappings for network protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

View file

@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/