Skip to content
Commit 6469c92e authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'jwb/jwb-merge' into merge 

Manual merge of:
	arch/powerpc/configs/44x/warp_defconfig
parents 0411648e 0b21bcd5
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