| commit | 9559cc239d6cf50bf64de0bd7662103238e84274 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Fri Jan 18 14:40:47 2008 -0500 |
| committer | Jeff Garzik <jeff@garzik.org> | Fri Jan 18 14:40:47 2008 -0500 |
| tree | 53becf36c23e2dc9931c3363f71ec0a81d131b79 | |
| parent | e236ed23f81430dc020304e2efbc0cfcdf47d9a7 [diff] | |
| parent | d101f6496d51cbeb285f531dff059ce0ef28ffe3 [diff] |
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes