Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
linux
Repository
6fa52ed33bea997374a88dbacbba5bf8c7ac4fef
Switch branch/tag
linux
arch
arm
mach-omap2
board-generic.c
Find file
Blame
History
Permalink
Merge branch 'omap-timer-for-v3.10' of
git://github.com/jonhunter/linux
into omap-for-v3.10/timer
· 7f585bbf
Tony Lindgren
authored
Apr 03, 2013
Conflicts: arch/arm/mach-omap2/timer.c
7f585bbf
board-generic.c
4.91 KB
Edit
Web IDE
Replace board-generic.c
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace board-generic.c
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.