Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Showing
- drivers/net/ixgbe/ixgbe_fcoe.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_fcoe.c
- drivers/net/ixgbe/ixgbe_main.c 2 additions, 2 deletionsdrivers/net/ixgbe/ixgbe_main.c
- drivers/net/wireless/rt2x00/rt2x00.h 4 additions, 2 deletionsdrivers/net/wireless/rt2x00/rt2x00.h
- net/mac80211/agg-tx.c 8 additions, 0 deletionsnet/mac80211/agg-tx.c
Loading
Please register or sign in to comment