From: David S. Miller Date: Tue, 30 Sep 2014 05:30:50 +0000 (-0400) Subject: Merge branch 'am335x' X-Git-Tag: fixes-against-v3.18-rc2~144^2~104 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=213d61386ee8a0a704d99922dbdb99f9c233d630;p=pandora-kernel.git 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 Signed-off-by: David S. Miller --- 213d61386ee8a0a704d99922dbdb99f9c233d630 Reading git-diff-tree failed