Merge branch 'master' of ../nf-2.6
commite8a96f69383f3d88cdc06d8ccd450f70c48628a3
authorPatrick McHardy <kaber@trash.net>
Thu, 18 Mar 2010 11:55:50 +0000 (18 12:55 +0100)
committerPatrick McHardy <kaber@trash.net>
Thu, 18 Mar 2010 11:55:50 +0000 (18 12:55 +0100)
treeb8ce41ee20eb379731e7592d7b6fb17471918a61
parentc01ae818a3e3578747861d9a0c7fabe9641786c1
parent1da05f50f6a766c7611102382f85183b4db96c2d
Merge branch 'master' of ../nf-2.6
net/bridge/netfilter/ebt_ip6.c