summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/nops.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 18:46:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 18:46:43 -0700
commit15f7176eb1cccec0a332541285ee752b935c1c85 (patch)
tree9d33689be7415388ed57f437faaae883a4978a85 /arch/x86/include/asm/nops.h
parentd3d52d687a770973b459d8a92ec1adbba3f60c4b (diff)
parent321dee6e8b235c496f0a068a72d8df9a4e13ceb9 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: wireless: remove duplicated .ndo_set_mac_address netfilter: xtables: fix IPv6 dependency in the cluster match tg3: Add GRO support. niu: Add GRO support. ucc_geth: Fix use-after-of_node_put() in ucc_geth_probe(). gianfar: Fix use-after-of_node_put() in gfar_of_init(). kernel: remove HIPQUAD() netpoll: store local and remote ip in net-endian netfilter: fix endian bug in conntrack printks dmascc: fix incomplete conversion to network_device_ops gso: Fix support for linear packets skbuff.h: fix missing kernel-doc ni5010: convert to net_device_ops
Diffstat (limited to 'arch/x86/include/asm/nops.h')
0 files changed, 0 insertions, 0 deletions