diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 00:54:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 00:54:16 -0400 |
| commit | 8e268f333012c62fc6a5a10e1e2a19c1c389853e (patch) | |
| tree | caa132b137e1d65c7cf42a37ac23bfad41c3d6e1 /net/ipv4/tcp_htcp.c | |
| parent | cbdd3deb52ac9b013a63e4a60530717f75ce3177 (diff) | |
| parent | 75c46162be3d0025d448e0b738d6f8b51ff8a6e5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: Kill off virt_to_bus()/bus_to_virt().
sh64: Fix irq_intc build failure.
sh64: Fix fs.h removal from mm.h regressions.
Diffstat (limited to 'net/ipv4/tcp_htcp.c')
0 files changed, 0 insertions, 0 deletions