tree c8bae5786c369e42ac7eba9191fbad0721bcd73c
parent e3f2ddeac718c768fdac4b7fe69d465172f788a8
parent ca0084fa90533687b6317e6d084141da87c74d5c
author Jeff Garzik <jeff@garzik.org> 1154147549 -0400
committer Jeff Garzik <jeff@garzik.org> 1154147549 -0400

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes