TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	drivers/net/smsc911x.c
This commit is contained in:
David S. Miller
2011-04-11 13:44:25 -07:00
parent c44d79950b 4a9f65f630
commit 1c01a80cfe
2765 changed files with 7223 additions and 8041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/fib_trie.c
View File

@@ -12,7 +12,7 @@
*
* Hans Liss <hans.liss@its.uu.se> Uppsala Universitet
*
* This work is based on the LPC-trie which is originally descibed in:
* This work is based on the LPC-trie which is originally described in:
*
* An experimental study of compression methods for dynamic tries
* Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002.