Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
commit9ea7d6cb9c223e8b0887b8b0355470acb947a1c9
authorJeff Garzik <jeff@garzik.org>
Sat, 12 Jan 2008 22:44:35 +0000 (12 17:44 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 12 Jan 2008 22:44:35 +0000 (12 17:44 -0500)
treeb8c4be1dbdf4bb2167dd9a3f2cea73e0c9c3121b
parent94d433630a1e63d383d592d488f60581e0d98190
parentc5d0dc5f0dd66770232d7d360c770d2344b76d52
Merge branch 'fixes-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes