summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-05-05 22:14:16 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-05-05 22:14:16 +0200
commit83163244f845c296a118ce85c653872dbff6abfe (patch)
treece2eac695a1c198f23d537e20ed86c16ece21f7e /arch/mips
parentforcedeth: Kill NAPI config options. (diff)
parentmac80211: use fixed channel in ibss join when appropriate (diff)
downloadlinux-83163244f845c296a118ce85c653872dbff6abfe.tar.xz
linux-83163244f845c296a118ce85c653872dbff6abfe.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts: drivers/net/wireless/libertas_tf/cmd.c drivers/net/wireless/libertas_tf/main.c
Diffstat (limited to 'arch/mips')
0 files changed, 0 insertions, 0 deletions