Skip to content
Commit 236573d2 authored by Simon Horman's avatar Simon Horman
Browse files

Merge tag 'v3.13-rc3' into dt3-base 

Linux 3.13-rc3

Conflicts:
	drivers/pinctrl/sh-pfc/pfc-r8a7740.c
	drivers/pinctrl/sh-pfc/pfc-sh7372.c
parents 97aee1b8 374b1057
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