Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorJeff Garzik <jeff@garzik.org>
Fri, 18 Jan 2008 19:40:47 +0000 (14:40 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 18 Jan 2008 19:40:47 +0000 (14:40 -0500)
commit9559cc239d6cf50bf64de0bd7662103238e84274
tree53becf36c23e2dc9931c3363f71ec0a81d131b79
parente236ed23f81430dc020304e2efbc0cfcdf47d9a7
parentd101f6496d51cbeb285f531dff059ce0ef28ffe3
Merge branch 'fixes-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes