tree c6e15822d1da2811ed004d3f8a4c72864adb5250
parent b7ad6d75028d021362221d9b2db19fcff995c3f8
parent fe0b06b123762ab620b5bee3dab1576ddddd0a7f
author Jeff Garzik <jeff@garzik.org> 1143086157 -0500
committer Jeff Garzik <jeff@garzik.org> 1143086157 -0500

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