summaryrefslogtreecommitdiffstats
path: root/Documentation/bus-devices
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-22 23:46:24 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-22 23:46:24 +0100
commitbb27d4998a9e8767674e8eda225c82cc149e5bc8 (patch)
treedcabb8b8cc510003637323b30ed414b1a1ec86f6 /Documentation/bus-devices
parentstaging: wilc1000: wilc_wfi_netdevice: Remove header files (diff)
parentmei: fix format string in debug prints (diff)
downloadlinux-bb27d4998a9e8767674e8eda225c82cc149e5bc8.tar.xz
linux-bb27d4998a9e8767674e8eda225c82cc149e5bc8.zip
Merge char-misc-next into staging-next
This resolves the merge issues and confusions people were having with the goldfish drivers due to changes for them showing up in two different trees. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/bus-devices')
0 files changed, 0 insertions, 0 deletions