Merge branch '6lowpan'
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Oct 2013 19:28:53 +0000 (15:28 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Oct 2013 19:28:53 +0000 (15:28 -0400)
commit8cc27d174b6502a4a9dc6186f35bf1351a6e200e
tree0603d870482719fef905b411a79352e69f0bca30
parent88ba09df236c618b5466d35a0165df0dc865eac5
parentab2d95df9c19f45805977be1c869ba3df9a10835
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>