diff options
author | David S. Miller <davem@davemloft.net> | 2008-04-03 23:33:42 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-03 23:33:42 +0200 |
commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
tree | c92d5684a866542b1cb20641607ac1643ce03a47 /drivers/atm/ambassador.c | |
parent | [NETNS]: Use TCP control socket from a correct namespace. (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
download | linux-3bb5da3837cc1aa17736b05139c9a22c3794851a.tar.xz linux-3bb5da3837cc1aa17736b05139c9a22c3794851a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/atm/ambassador.c')
0 files changed, 0 insertions, 0 deletions