Skip to content
Commit b9e3b72d authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'pinctrl-mergebase-20120418' into HEAD 

Conflicts:
	drivers/pinctrl/core.c
parents c0af14d3 dcb5dbc3
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