git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1a80dcf
6c00905
)
Linux-omap rebuilt: Rebuilt with pending omap patches
author
Tony Lindgren
<tony@atomide.com>
Mon, 26 Jan 2015 21:28:34 +0000
(13:28 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 26 Jan 2015 21:28:34 +0000
(13:28 -0800)
$ git checkout -b tmp-rebuild-
1422307708
linus
$ git merge -m "Merge for-next" for-next
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1422307708
To view the changes since the last rebuild, please do
$ git diff
6c00905053129897cd9d0e404058705e89fa9373
..
1a80dcf6c1e63b9f8073c735c5daa2cc8f2242eb
arch/arm/*omap*/
Trivial merge