Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Sat, 29 Jul 2006 04:33:35 +0000 (00:33 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 29 Jul 2006 04:33:35 +0000 (00:33 -0400)
commit7d2d8259a2a3078c629b6ee9d4a7ae3ef74ac100
tree4184f2a7d58ba1a1729225404e52d9a89463dd77
parenta47e9209485243afb4f002b8c3d76d1990b09d0a
parent8f0f850e240df5bea027caeb1723142c50e37e57
Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream
MAINTAINERS