| commit | 220df5c3defc33cc3cacc0db7487eba801023977 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Fri Jan 18 14:39:26 2008 -0500 |
| committer | Jeff Garzik <jeff@garzik.org> | Fri Jan 18 14:39:26 2008 -0500 |
| tree | dc113f20d4402b8549b8e261f04a9d4a4cea5d75 | |
| parent | 5655662dab4ef044be7efd155f2f5fef2e486545 [diff] | |
| parent | 47cccd7d7cc1f2b6f34aadc9041fb991c6293cdd [diff] |
Merge branch 'ipg-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-fixes