]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 21 Sep 2010 19:49:14 +0000 (15:49 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 21 Sep 2010 19:49:14 +0000 (15:49 -0400)
commitb618f6f885579a6237e5bf4582fa6167972ddef4
treeb11508178570b98ce9cb2d76ecebd046a6f0e77c
parent462fb2af9788a82a534f8184abfde31574e1cfa0
parent6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
arch/arm/mach-omap2/board-omap3pandora.c
drivers/net/wireless/ath/ath5k/base.c
17 files changed:
MAINTAINERS
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-rx51-peripherals.c
drivers/net/wireless/airo.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/eeprom.h
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/ray_cs.c
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
net/mac80211/main.c
net/wireless/core.c