summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-5000.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-12-17 21:27:22 +0100
committerDavid S. Miller <davem@davemloft.net>2010-12-17 21:27:22 +0100
commitb4aa9e05a61b845541fa6f5b1d246976922601f0 (patch)
treeca94478c3df281ab76a3399f5ba6341ade3f5791 /drivers/net/wireless/iwlwifi/iwl-5000.c
parentqlcnic: reset pci function unconditionally during probe (diff)
parentnetlink: fix gcc -Wconversion compilation warning (diff)
downloadlinux-b4aa9e05a61b845541fa6f5b1d246976922601f0.tar.xz
linux-b4aa9e05a61b845541fa6f5b1d246976922601f0.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bnx2x/bnx2x.h drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/vhost/vhost.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
0 files changed, 0 insertions, 0 deletions