- net-next.git - net-next plumbings
summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-15 12:38:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-15 12:38:53 -0800
commit2d5a7101a140adcf7a5d8677649847fbb2dd5a2f (patch)
tree02e3532964dd4c42aa6ea2187fee67e6dfee36dd /include/uapi
parent7f138b9706f5f3528d598aefd35337d54a8c1afb (diff)
parentc7334ce814f7e5d8fc1f9b3126cda0640c2f81b3 (diff)
Merge tag 'driver-core-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fix from Greg KH: "Here is a single patch being reverted to remove a feature that was added in 4.10-rc1 that isn't quite ready for release. It will be redone as a debugfs file instead of a sysfs file in the future" * tag 'driver-core-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: Revert "driver core: Add deferred_probe attribute to devices in sysfs"
Diffstat (limited to 'include/uapi')