Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:16:17 +0000 (00:16 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:16:17 +0000 (00:16 -0400)
commite988bcdbe92eb61ea5bfe18aaba6986184118212
treeae68cbbfdbd06453ae4843f84820c9a3c15d7c7b
parentc9b84dcac6e20ec8e5424f3dff853daa863bfdd0
parentbc519f30eb039f023c15167663d5a8a14fed7dcb
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes