Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 8b5fd851 authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

Merge branch 'for-mfd-and-power' of git://git.linaro.org/people/ljones/linux-3.0-ux500 



Conflicts:
	drivers/mfd/ab8500-gpadc.c

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parents 9d66b568 b09f86db
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