Skip to content
GitLab
Explore
Sign in
Commit
a2166ca5
authored
Mar 29, 2015
by
Grant Likely
Browse files
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Conflicts: drivers/of/unittest.c
parents
37791b6f
01218bf1
Changes
47
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment