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

Merge tag 'v3.12-rc6' into devel 

Linux 3.12-rc6

Conflicts:
	drivers/gpio/gpio-lynxpoint.c
parents 0963d59b 31d141e3
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