Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Dec 2010 20:35:34 +0000 (15:35 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Dec 2010 20:35:34 +0000 (15:35 -0500)
commitf435d9eea01309aa7b6c1f134569a7b5957918ae
tree2737a48d423a8191671098b15aabd6391af2d23a
parent5ee493767352314893520ac40aec5bb07d0147e0
parent09f921f83faa49cdea25abfb98c439c01526b89d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem