tree b76a004c00cd7139659be515ee03398e47067290
parent 6cd15a9daf826115356f9403494c76e5aafa7793
parent ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf
author  <jgarzik@pretzel.yyz.us> 1117246087 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1117246087 -0400

Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211