diff options
author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /Documentation/ABI/testing/sysfs-bus-mdio | |
parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'Documentation/ABI/testing/sysfs-bus-mdio')
-rw-r--r-- | Documentation/ABI/testing/sysfs-bus-mdio | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-mdio b/Documentation/ABI/testing/sysfs-bus-mdio new file mode 100644 index 000000000000..6349749ebc29 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-mdio | |||
@@ -0,0 +1,9 @@ | |||
1 | What: /sys/bus/mdio_bus/devices/.../phy_id | ||
2 | Date: November 2012 | ||
3 | KernelVersion: 3.8 | ||
4 | Contact: netdev@vger.kernel.org | ||
5 | Description: | ||
6 | This attribute contains the 32-bit PHY Identifier as reported | ||
7 | by the device during bus enumeration, encoded in hexadecimal. | ||
8 | This ID is used to match the device with the appropriate | ||
9 | driver. | ||