Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Sat, 21 Oct 2006 18:21:11 +0000 (14:21 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 21 Oct 2006 18:21:11 +0000 (14:21 -0400)
commitcde49b058474ab3f7ff830283e5b538e8fbeefe5
tree28fdc4035af01d19c4f976d020ce98f251298182
parentcfadbd298e8b3e7f2e324696b653bb74094590db
parent41072a1be57f63bf83afc31c44d72de018d800fa
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes