From: David S. Miller Date: Tue, 26 Mar 2013 16:32:40 +0000 (-0400) Subject: Merge branch 'ipv6-firewire' X-Git-Tag: v3.10-rc1~120^2~330 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8dc57da2e23085642cad20d11385e13e079715c4;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'ipv6-firewire' YOSHIFUJI Hideaki says: ==================== This is take 4 of supporting IPv6 over Firewire (IEEE 1394) based on RFC3146. Take 3->4: - Fix receiving 1394 ARP, which comes without arp$tha. - Remove rfc3146 unit directory on module exit. - other minor clean-ups - minimize diffs. ==================== Signed-off-by: David S. Miller --- 8dc57da2e23085642cad20d11385e13e079715c4