diff options
author | Tony Lindgren <tony@atomide.com> | 2012-02-17 15:08:20 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-02-17 15:08:20 -0800 |
commit | b0ee4e394009f02a1d1b166091a19e8b842b4ea4 (patch) | |
tree | 75e6df725e5402ed6fe9d78f23bf5cf45cfdf9d9 /drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | |
parent | abe763f2bccbc592d33a3a9c334acaefea022c0a (diff) | |
parent | 03e4fd6eb25e6b46536ecdb0d1b7d33d46b15480 (diff) | |
download | blackbird-op-linux-b0ee4e394009f02a1d1b166091a19e8b842b4ea4.tar.gz blackbird-op-linux-b0ee4e394009f02a1d1b166091a19e8b842b4ea4.zip |
Merge branch 'for_3.3/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c')
0 files changed, 0 insertions, 0 deletions