Merge branch 'we21-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Sat, 21 Oct 2006 18:11:15 +0000 (14:11 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 21 Oct 2006 18:11:15 +0000 (14:11 -0400)
commitaf60496f746596fdbc7a9ffa1a96f97e1bc59bcf
tree94a5782a0619e678903c3efa69ced0894e7d1a62
parent18a8e8649d2687283da51fbcf8218372dc5a8f6f
parent98978edb6278f0fb30c8d636c6a79a28f9164cb9
Merge branch 'we21-fix' of git://git./linux/kernel/git/linville/wireless-2.6 into tmp