forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	net/mac80211/ht.c
This commit is contained in:
David S. Miller 2009-12-01 22:13:38 -08:00
commit ff9c38bba3
233 changed files with 4039 additions and 933 deletions
Download patch file Download diff file Expand all files Collapse all files

1
net/xfrm/xfrm_algo.c
View file

@ -399,6 +399,7 @@ static struct xfrm_algo_desc ealg_list[] = {
},
{
.name = "cbc(camellia)",
.compat = "camellia",
.uinfo = {
.encr = {