diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 10:08:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 10:08:08 -0700 |
| commit | fffdedef691a0f6fa7ca1fc0a2a508cbb49def69 (patch) | |
| tree | 124b128308a4d35bab0ac8001da4b324d40220eb /block | |
| parent | 5723ff931a94acf0738df42604ee89f852e151b0 (diff) | |
| parent | bf94e17bc8d35fc339945a42990a2f2b5e9b5a40 (diff) | |
| download | op-kernel-dev-fffdedef691a0f6fa7ca1fc0a2a508cbb49def69.zip op-kernel-dev-fffdedef691a0f6fa7ca1fc0a2a508cbb49def69.tar.gz | |
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:
net/mac80211/rx.c: fix build error
acpi: Make ACPI_TOSHIBA depend on INPUT.
net/bfin_mac.c MDIO namespace fixes
jme: remove unused #include <version.h>
netfilter: remove unused #include <version.h>
net: Fix off-by-one in skb_dma_map
smc911x: Add support for LAN921{5,7,8} chips from SMSC
qlge: remove duplicated #include
wireless: remove duplicated #include
net/au1000_eth.c MDIO namespace fixes
net/tc35815.c: fix compilation
sky2: Fix WOL regression
r8169: NULL pointer dereference on r8169 load
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions
