diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-15 07:46:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-15 07:46:36 -0700 |
| commit | e126c7b6bbb0c5b5fc3ecf2fd1ae67c803b747cc (patch) | |
| tree | 627ae2a512194ed3cb9f0720f14706dd9d76ec16 /net/ipv6/tcp_ipv6.c | |
| parent | 22b1a9203ea634ac0ee5240e021613da3328275f (diff) | |
| parent | 220ddc0847ebd42d18ee78c7e1c2f4c2e3be637d (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix console output getting dropped on platforms without udbg_putc
[POWERPC] Fix per-cpu allocation on oldworld SMP powermacs
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
0 files changed, 0 insertions, 0 deletions