tree 8844a54f2b205bb5dceb6391d05df9a9f8bc62d2
parent d378aca6ec708bfb24df5c47801b1f2399efc481
parent cc8279f68c34c3f32b3a85f3103b0ad755c57846
author Jeff Garzik <jeff@garzik.org> 1142847530 -0500
committer Jeff Garzik <jeff@garzik.org> 1142847530 -0500

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