git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	John W. Linville <linville@tuxdriver.com>
	Fri, 8 Oct 2010 19:39:28 +0000 (15:39 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 8 Oct 2010 19:39:28 +0000 (15:39 -0400)
commit	8f968a5c61acfc01b4ade81d90d23da5c29f78c7
tree	d9f76964c77c1059483b08436ed060b702b8e25d	tree \| snapshot
parent	a028c3d89416389f54e77dd1a0466a8cba484976	commit \| diff
parent	f0ba453949adfd9aad402e5bd0bd15f7caf8f075	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ipw2x00/ipw2200.c

12 files changed:

Linux Kernel Source Tree.

RSS Atom

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/phy_n.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cfg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2500usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt61pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt73usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/wl1271_scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.h	diff1 \|	diff2 \|	blob \| history