diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-12 14:41:02 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-12 14:41:02 -0800 |
commit | 1561747ddf9d28185548687b11aae7074d6129c4 (patch) | |
tree | 7d0561b6fd8e5f6e6f30e49142213bfb348be5ac /drivers/net/pptp.c | |
parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 (diff) | |
parent | ixgbe: DCB, PFC not cleared until reset occurs (diff) | |
download | linux-dev-1561747ddf9d28185548687b11aae7074d6129c4.tar.xz linux-dev-1561747ddf9d28185548687b11aae7074d6129c4.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/pptp.c')
0 files changed, 0 insertions, 0 deletions