diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 13:38:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 13:38:09 -0500 |
| commit | 30fbc9f77c5a77f5f7f053d29eb92e41f6043406 (patch) | |
| tree | 4f50cab4a3f37133dc5c1c35ee0d10934276a23d /net/ipv4 | |
| parent | 6e96783f586cc0a64651087cb518209a8577123f (diff) | |
| parent | 8960909ca71da6120cad2fd7ece7dbe32ae05b40 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] DEC: Remove call to register_prom_console.
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions