Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2008 22:39:41 +0000 (15:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2008 22:39:41 +0000 (15:39 -0700)
commit54dceb008ffcbe003bea9017cad1227a83b6fc3f
treed4e3345ead16da19efe38dbf97ade38309f8b4f7
parent11a100f844f6096787ab20e19f17d72abc957a8f
parentb46372710ab536c0967f76be5dc41341583d4a54
Merge branch 'master' of /linux/kernel/git/linville/wireless-next-2.6