diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 16:07:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 16:07:48 -0700 |
| commit | ddc752a4068088bfc5558a3f72e4f7cca3fc1210 (patch) | |
| tree | 1effbc4fdae3c14cfe4f2bffa2f601ec6c1d7776 /net/ipv6/ip6mr.c | |
| parent | 31bad9246b5e17d547430697791acca5e9712333 (diff) | |
| parent | 430ac5ba9c74f236ddd695b1282a889630cb4f91 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] use bcd2bin/bin2bcd
[IA64] Ensure cpu0 can access per-cpu variables in early boot code
Diffstat (limited to 'net/ipv6/ip6mr.c')
0 files changed, 0 insertions, 0 deletions