| commit | 23aee82e75c1ced9492cbff6090b8e213d95945e | [log] [tgz] |
|---|---|---|
| author | Stephen Hemminger <shemminger@osdl.org> | Mon May 08 16:01:20 2006 -0700 |
| committer | Stephen Hemminger <shemminger@osdl.org> | Mon May 08 16:01:20 2006 -0700 |
| tree | 2d8f0f7fc59a65bffc852c7dc167ee6b196c07a7 | |
| parent | 8ec93459655a3618dedec6360bb28d63f0010ef6 [diff] | |
| parent | 178e0cc5ff249965c6cfbd78b1af6a5e614d837c [diff] |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6