diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 09:09:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 09:09:48 -0700 |
commit | b73b636e8987f8728c6c700377615757691b9a55 (patch) | |
tree | 554a4c799888e8934d2bf222bd0fcae2a9146bb4 /net/ipv6/sit.c | |
parent | ed09441dacc2a2d6c170aa3b1f79a041291a813f (diff) | |
parent | 8f808417fe211648c0816e28947cdc74eb1e1032 (diff) |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
CRIS: proper defconfig setup
[CRIS] Rename boot-linkscripts and fix the path to them.
Diffstat (limited to 'net/ipv6/sit.c')
0 files changed, 0 insertions, 0 deletions