summaryrefslogtreecommitdiffstats
path: root/usr/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2009-03-31 03:46:43 +0200
committerLinus Torvalds2009-03-31 03:46:43 +0200
commit15f7176eb1cccec0a332541285ee752b935c1c85 (patch)
tree9d33689be7415388ed57f437faaae883a4978a85 /usr/Makefile
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parentwireless: remove duplicated .ndo_set_mac_address (diff)
downloadkernel-qcow2-linux-15f7176eb1cccec0a332541285ee752b935c1c85.tar.gz
kernel-qcow2-linux-15f7176eb1cccec0a332541285ee752b935c1c85.tar.xz
kernel-qcow2-linux-15f7176eb1cccec0a332541285ee752b935c1c85.zip
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 'usr/Makefile')
0 files changed, 0 insertions, 0 deletions