Skip to content
Commit 92f4ede7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git 

# Conflicts:
#	drivers/of/Makefile
#	include/linux/of.h
parents 8c239402 3d143143
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