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
710 changed files with 18610 additions and 11656 deletions
+1 -1
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>
*
*/