Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Sat, 3 Mar 2007 00:40:24 +0000 (19:40 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 3 Mar 2007 00:40:24 +0000 (19:40 -0500)
commitdb7ce76f6b3dfc119ab2f03e5e7784afc9cf2f05
treeec31336d5f6ee956e69074a9f3494c30bb053dfa
parent43ecf5295b622e9ec93f5b932949acf1c6e4150c
parent357efd57f229716fd6a1494b970c5a66c0c465ef
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes