Skip to content
Commit fda87903 authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next 

Conflicts:
	drivers/gpio/gpio-pl061.c
parents 1a0703ed 2de0dbc5
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