diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-02-10 21:44:34 +0400 | 
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-02-10 21:44:45 +0400 | 
| commit | 41a11e31d4584eb7c2ae08f2941c3e41d8c6316a (patch) | |
| tree | ff22db108ef685df1d93139995e62eb825dace98 /tools/perf/scripts/python/futex-contention.py | |
| parent | 8b7dfa7dc701a27ac8ea4c4dfc0dbc8dce4825de (diff) | |
| parent | 90aa2997029fa623fe9e3ec3a469a00a34130237 (diff) | |
| download | linux-41a11e31d4584eb7c2ae08f2941c3e41d8c6316a.tar.xz | |
Merge tag 'mvebu-phy_ata-fixes-3.14' of git://git.infradead.org/linux-mvebu into fixes
From Jason Cooper:
mvebu phy and ata fixes for v3.14
 - phy
    - add support for optional phys via NULL
 - ata
    - fix boot hang due to probe failure of optional phys
NOTE:  Series has been Ack'd by both the phy maintainer and the ata maintainer
for going through arm-soc
* tag 'mvebu-phy_ata-fixes-3.14' of git://git.infradead.org/linux-mvebu:
  ata: sata_mv: Fix probe failures with optional phys
  drivers: phy: Add support for optional phys
  drivers: phy: Make NULL a valid phy reference
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'tools/perf/scripts/python/futex-contention.py')
0 files changed, 0 insertions, 0 deletions
