]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'nf' of git://1984.lsi.us.es/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 29 Nov 2011 06:20:55 +0000 (01:20 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Nov 2011 06:20:55 +0000 (01:20 -0500)
commitc1baa88431fe0fe4fad492dece4177a7735f89cf
tree3513c0018bd149625aa999b82c0ed6097a55a267
parenta5e5c37434eb182cf50cec90d9736d9a9a390116
parent70e9942f17a6193e9172a804e6569a8806633d6b
Merge branch 'nf' of git://1984.lsi.us.es/net