diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 11:37:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 11:37:21 +1100 |
| commit | a8e4c805c5c0c214a2b43a444db133cafbecff30 (patch) | |
| tree | 0d47955a09410fdb3049ffa94bee0aaca6b57c15 /Documentation/ABI/testing/sysfs-devices-system-cpu | |
| parent | 104bef8a2f158f1cfb2d5c631f8f54d94bb41709 (diff) | |
| parent | 421f2c8280ecf0cdc63b0948b15d15d95c3b2fbf (diff) | |
Merge remote-tracking branch 'libata/for-next'
Conflicts:
drivers/ata/ahci.c
Diffstat (limited to 'Documentation/ABI/testing/sysfs-devices-system-cpu')
0 files changed, 0 insertions, 0 deletions