Skip to content
Commit 70c74e59 authored by Michal Marek's avatar Michal Marek
Browse files

Merge branch 'message-callback' into kbuild/kconfig 

Conflicts:
	scripts/kconfig/nconf.c
parents b3235fe4 42368c37
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment