Skip to content
Commit 743f0ca4 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

Merge branch 'driver-core-next' of... 

Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git

# Conflicts:
#	arch/s390/kernel/topology.c
parents 61f1c1cd 00945520
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment