diff options
| author | Linus Torvalds | 2007-12-12 18:52:12 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2007-12-12 18:52:12 +0100 |
| commit | da8cadb31b82c9d41fc593c8deab6aa20b162d6b (patch) | |
| tree | 5640a34aa485f254de503a17833046645ade47f6 /net/netfilter/nf_conntrack_netlink.c | |
| parent | Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff) | |
| parent | [SPARC64]: Fix endless loop in cheetah_xcall_deliver(). (diff) | |
| download | kernel-qcow2-linux-da8cadb31b82c9d41fc593c8deab6aa20b162d6b.tar.gz kernel-qcow2-linux-da8cadb31b82c9d41fc593c8deab6aa20b162d6b.tar.xz kernel-qcow2-linux-da8cadb31b82c9d41fc593c8deab6aa20b162d6b.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix endless loop in cheetah_xcall_deliver().
[SERIAL] sparc: Infrastructure to fix section mismatch bugs.
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
0 files changed, 0 insertions, 0 deletions