tree c0531faf1c8925ba36fc2cb6e9ac17b1ce0f35d5
parent 084cb0fe773dc3dbe2bb08039dbd0e9e93d103ce
parent f8036965ccec4d786d8bf09bf57b793542cb3dce
author John W. Linville <linville@tuxdriver.com> 1279049511 -0400
committer John W. Linville <linville@tuxdriver.com> 1279049511 -0400

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