path: root/Makefile
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-04 13:55:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-04 13:55:49 -0800
commit65f42886e24be2197b1263f138eabf40c6774d00 (patch)
treec45ab3a3634a9a949f54b7ee4ca9295db5674e5e /Makefile
parent8a87694ed159d7abd2c9ed657416696c05db2252 (diff)
parent9fc3bbb4a752f108cf096d96640f3b548bbbce6c (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: ipv4/route.c: respect prefsrc for local routes bridge: stp: ensure mac header is set bridge: fix br_multicast_ipv6_rcv for paged skbs atl1: fix oops when changing tx/rx ring params drivers/atm/atmtcp.c: add missing atm_dev_put starfire: Fix dma_addr_t size test for MIPS tg3: fix return value check in tg3_read_vpd() Broadcom CNIC core network driver: fix mem leak on allocation failures in cnic_alloc_uio_rings() ISDN, Gigaset: Fix memory leak in do_disconnect_req() CAN: Use inode instead of kernel address for /proc file skfp: testing the wrong variable in skfp_driver_init() ppp: allow disabling multilink protocol ID compression ehea: Avoid changing vlan flags ueagle-atm: fix PHY signal initialization race
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions