| commit | 6585b4a71f523485ecf33e7f4569be4095d63699 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Mon Feb 11 11:07:34 2008 -0500 |
| committer | Jeff Garzik <jeff@garzik.org> | Mon Feb 11 11:07:34 2008 -0500 |
| tree | 6f52233199b5d63cf74dcd308842681ab91cb88a | |
| parent | 179c743ff11b7ef3c0df4748b28c761a5fe19b11 [diff] | |
| parent | ec6d2d453a932fd50c5fd95d5aac633b4e5f241d [diff] |
Merge branch 'r6040' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-fixes