Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
commit34a5d713056c325e5bf2b5361646585d5f550a72
authorDavid S. Miller <davem@davemloft.net>
Sun, 15 Jun 2008 00:33:38 +0000 (14 17:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Jun 2008 00:33:38 +0000 (14 17:33 -0700)
treed2dc0fb65b30469c877e79bc70c7345097aef31c
parent7775c9753b94fe429dc4323360d6502c95e0dd6e
parentcb62eccd7d946f7fb92b8beb79988726ec92c227
Merge branch 'master' of /linux/kernel/git/linville/wireless-2.6