tree 2737a48d423a8191671098b15aabd6391af2d23a
parent 5ee493767352314893520ac40aec5bb07d0147e0
parent 09f921f83faa49cdea25abfb98c439c01526b89d
author John W. Linville <linville@tuxdriver.com> 1291667734 -0500
committer John W. Linville <linville@tuxdriver.com> 1291667734 -0500

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