From: David S. Miller <davem@davemloft.net>
Date: Tue, 8 Oct 2013 19:28:53 +0000 (-0400)
Subject: Merge branch '6lowpan'
X-Git-Tag: v3.12-rc7~20^2~61
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8cc27d174b6502a4a9dc6186f35bf1351a6e200e;p=linux.git

Merge branch '6lowpan'

Alan Ott says:

====================
Alexander Aring suggested that devices desired to be linked to 6lowpan
be checked for actually being of type IEEE802154, since IEEE802154 devices
are all that are supported by 6lowpan at present.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

8cc27d174b6502a4a9dc6186f35bf1351a6e200e