Skip to content
Commit ab396e91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 

Fix up some trivial conflicts in {i386|ia64}/Makefile
parents 9979ead5 4f0210b9
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