From: Linus Torvalds Date: Tue, 23 Nov 2010 23:22:34 +0000 (+0900) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: Ubuntu-5.0.0-8.9~21013 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3cbaa0f7a78d3b970b566629ee298c310780b919;p=mirror_ubuntu-disco-kernel.git 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: of/phylib: Use device tree properties to initialize Marvell PHYs. phylib: Add support for Marvell 88E1149R devices. phylib: Use common page register definition for Marvell PHYs. qlge: Fix incorrect usage of module parameters and netdev msg level ipv6: fix missing in6_ifa_put in addrconf SuperH IrDA: correct Baud rate error correction atl1c: Fix hardware type check for enabling OTP CLK net: allow GFP_HIGHMEM in __vmalloc() bonding: change list contact to netdev@vger.kernel.org e1000: fix screaming IRQ --- 3cbaa0f7a78d3b970b566629ee298c310780b919