Merge branch 'connectivity-linux-3.8.y' into ti-linux-3.8.y

Merge branch 'connectivity-linux-3.8.y' into ti-linux-3.8.y

TI-Feature: connectivity_base
TI-Tree: git://gitorious.ti.com/ti-linux-kernel/connectivity-linux-feature-tree.git
TI-Branch: connectivity-linux-3.8.y

* connectivity-linux-3.8.y:
  ARM: dts: AM33XX: Add CPSW phy_id device tree data to am335x-evmsk
  net: ethernet: cpsw: fix usage of cpdma_check_free_tx_desc()
  drivers: net: ethernet: cpsw: implement get phy_id via ioctl
  driver: net: ethernet: cpsw: implement interrupt pacing via ethtool
  driver: net: ethernet: cpsw: implement ethtool get/set phy setting
  drivers: net: ethernet: cpsw: change cpts_active_slave to active_slave
  documentation: dt: bindings: cpsw: cleanup documentation
  drivers: net: ethernet: cpsw: consider number of slaves in interation
  drivers: net: davinci_cpdma: acknowledge interrupt properly
  net: cwdavinci_cpdma: export symbols for cpsw
  net: ethernet: ti: remove redundant NULL check.
  driver: net: ethernet: cpsw: dual emac interface implementation
  driver: net: ethernet: cpsw: make cpts as pointer
  driver: net: ethernet: davinci_cpdma: add support for directed packet and source port detection
  drivers: net:ethernet: cpsw: add support for VLAN
  drivers: net: cpsw: Add helper functions for VLAN ALE implementation
  net: ethernet: davinci_cpdma: Add boundary for rx and tx descriptors

Conflicts:
	arch/arm/boot/dts/am335x-evmsk.dts

Signed-off-by: Dan Murphy <dmurphy@ti.com>