Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jgarzik@pobox.com>
Tue, 31 Jan 2006 16:50:55 +0000 (11:50 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 31 Jan 2006 16:50:55 +0000 (11:50 -0500)
commit0b310f36d7d96e27f6941ec0f9b95e15142f1e78
treec2a3d403c82fd892ded3849cc721cf8e6f8c7824
parent359b8800d3a46557844969c485e1a14baf119b06
parent2f633db5e9c57e07a971b65e9a72f090f59fd5f6
Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6