tree d9f76964c77c1059483b08436ed060b702b8e25d
parent dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44
parent 15a6321d1c0f8db561932cd99e1b9897981da71f
author John W. Linville <linville@tuxdriver.com> 1286566768 -0400
committer John W. Linville <linville@tuxdriver.com> 1286566768 -0400

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