diff options
author | David S. Miller <davem@davemloft.net> | 2013-02-09 00:02:14 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-09 00:02:14 +0100 |
commit | fd5023111cf720db890ef34f305ac5d427e690a0 (patch) | |
tree | 4d21e9a02bfbdafe5fc598af0755db791238dbe7 /arch/x86/boot/mkcpustr.c | |
parent | cxgb4vf: Fix extraction of cpl_rx_pkt from the response queue descriptor (diff) | |
parent | Linux 3.8-rc7 (diff) | |
download | linux-fd5023111cf720db890ef34f305ac5d427e690a0.tar.xz linux-fd5023111cf720db890ef34f305ac5d427e690a0.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Synchronize with 'net' in order to sort out some l2tp, wireless, and
ipv6 GRE fixes that will be built on top of in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/boot/mkcpustr.c')
0 files changed, 0 insertions, 0 deletions