Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:46:13 +0000 (17:46 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:46:13 +0000 (17:46 -0400)
commita513c315f95c6d73041436fd1598d51722bd6264
tree505f9a15c1771756cf21011e3f291b81c86cb3df
parentfd6746daade513bf7f887625c107878b6aacccfd
parent113b898e38cb20e80847c24154ce62273b948c6a
Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream