Skip to content
GitLab
Explore
Sign in
Commit
33b9f582
authored
May 02, 2013
by
Russell King
Browse files
Merge branch 'cleanup' into for-linus
Conflicts: arch/arm/plat-omap/dmtimer.c
parents
946342d0
008ca431
Changes
19
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