Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville...
commit11897539a967059a817175ea57ad586a1faadd80
authorJeff Garzik <jeff@garzik.org>
Mon, 8 Jan 2007 03:44:56 +0000 (7 22:44 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 8 Jan 2007 03:44:56 +0000 (7 22:44 -0500)
tree67dfb1a5608a9439d0d263dde37be27eee1ad83b
parent80b02e595c308a5deb2ad49bd6aa3ab1da9cdbdb
parentfe5f8e2a1c5c040209c598a28e19c55f30e1040d
Merge branch 'upstream-fixes' of /linux/kernel/git/linville/wireless-2.6 into upstream-fixes