| commit | 983f27d37d4fc72c252835cb2ee3103b360735a6 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Fri May 26 22:01:26 2006 -0400 |
| committer | Jeff Garzik <jeff@garzik.org> | Fri May 26 22:01:26 2006 -0400 |
| tree | 8a7d3c3e251db494e285896debeb906473178a3e | |
| parent | de1e938e54deba5b093a3074dfafd0d11afacbe1 [diff] | |
| parent | e82b0f2cc21be905e504573483fa9542b15df96f [diff] |
Merge branch 'upstream-fixes' into upstream Conflicts: drivers/s390/net/ctctty.c