]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'am335x'
authorDavid S. Miller <davem@davemloft.net>
Tue, 30 Sep 2014 05:30:50 +0000 (01:30 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Sep 2014 05:30:50 +0000 (01:30 -0400)
commit213d61386ee8a0a704d99922dbdb99f9c233d630
tree0a50a83b55c6664725394b25f84ecc5d3e15f308
parent5f0c5f73e5efaee2928c4cabcf48b03f6ba99fc8
parentfa5f4adf3a1594d55d730ba68c10afa1edebf58a
Merge branch 'am335x'

Markus Pargmann says:

====================
net: cpsw: Support for am335x chip MACIDs

This series adds support to the cpsw driver to read the MACIDs of the am335x
chip and use them as fallback. These addresses are only used if there are no
mac addresses in the devicetree, for example set by a bootloader.
====================

Acked-by: Mugunthan V N <mugunthanvnm@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>