From: David S. Miller Date: Thu, 6 Mar 2014 22:21:43 +0000 (-0500) Subject: Merge branch '6lowpan' X-Git-Tag: firefly_0821_release~176^2~4167^2~215 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e86800f9201d35b6b2aac1583a9bf9e3a0b0c70d;p=firefly-linux-kernel-4.4.55.git Merge branch '6lowpan' Alexander Aring says: ==================== 6lowpan: header cleanup this patch series fix a missing include of 6LoWPAN header and move it into the include/net directory. Since we did some code sharing with bluetooth 6LoWPAN the header turns into a generic header for 6LoWPAN. Instead to use a relative path in bluetooth 6LoWPAN we can now use include . ==================== Signed-off-by: David S. Miller --- e86800f9201d35b6b2aac1583a9bf9e3a0b0c70d