diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-25 23:26:53 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-25 23:26:53 -0800 |
| commit | 8d2282a77bf0977e7033d8ea5970f369bc28f0f0 (patch) | |
| tree | 25af2fa8e1b4c001ebdbc97f465f946786ba1678 /drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | |
| parent | 24025f6f5821bf3715b283f6490212ac44d6a4fe (diff) | |
| parent | 25d6dd859e73248432051257b4b4d2a3d51b295b (diff) | |
| download | blackbird-op-linux-8d2282a77bf0977e7033d8ea5970f369bc28f0f0.tar.gz blackbird-op-linux-8d2282a77bf0977e7033d8ea5970f369bc28f0f0.zip | |
Merge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo:
They are a few mxs dts updates coming a little bit late. I'm sending
them as the second mxs/dt pull request for 3.8. Please consider to
pull.
* tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: mxs: add oled support for the cfa-10036
ARM: mxs: Add SchulerControl SPS1 DTS file
ARM: imx23-olinuxino: Add spi support
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c')
0 files changed, 0 insertions, 0 deletions
