| commit | 0d204094d15dac2e8a439b993f71eda385b4dccd | [log] [tgz] |
|---|---|---|
| author | Auke Kok <auke-jan.h.kok@intel.com> | Wed Jun 21 13:43:50 2006 -0700 |
| committer | Auke-jan Kok <ahkok@gitlost.site> | Wed Jun 21 13:43:50 2006 -0700 |
| tree | 647f0ddec94d0fb4aaf74fa55bcad75946030f8a | |
| parent | a487a8f7b6947f6445e5a1aa876522916785d5ec [diff] | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe [diff] |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6