Skip to content
GitLab
Explore
Sign in
Commit
2dde3bcc
authored
Nov 03, 2014
by
Tony Lindgren
Browse files
Merge branch 'for-v3.19/gpmc-omap' of github.com:rogerq/linux into omap-for-v3.19/gpmc
Conflicts: arch/arm/mach-omap2/gpmc.c
parents
8f595117
8bf9be56
Changes
1
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