diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-24 00:22:34 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-24 00:22:34 +0100 |
| commit | 3cbaa0f7a78d3b970b566629ee298c310780b919 (patch) | |
| tree | 5b392ab5d59cfd87d7a6869ab6681a63d14e7d04 /drivers/pcmcia/pd6729.c | |
| parent | Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff) | |
| parent | of/phylib: Use device tree properties to initialize Marvell PHYs. (diff) | |
| download | linux-3cbaa0f7a78d3b970b566629ee298c310780b919.tar.xz linux-3cbaa0f7a78d3b970b566629ee298c310780b919.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:
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
Diffstat (limited to 'drivers/pcmcia/pd6729.c')
0 files changed, 0 insertions, 0 deletions