Skip to content
Snippets Groups Projects
Commit 2bc7c852 authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'gpio/next-tegra' into gpio/next 

Conflicts:
	drivers/gpio/Kconfig
	drivers/gpio/Makefile
parents 12610be3 df221227
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 63 additions and 50 deletions
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