Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Jan 2009 20:22:26 +0000 (12:22 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Jan 2009 20:22:26 +0000 (12:22 -0800)
commit9a0811ca4e9cf7be320ae8a5a43a259feb70074f
treed8e0b2d1fcaa7e2da72d067fd7746b970bef457a
parent859975764fa61e927e7a69f46a55a4ba415785dd
parent26d1597c9a4532eec74f9651c4c96483cb8892fe
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6