Skip to content
GitLab
Commit 882d01f9 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable 

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
parents 64ed28a8 d608c738
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
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