git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
88ab5a0
b28e9de
)
Linux-omap rebuilt: Rebuilt with updated am33xx changes
author
Tony Lindgren
<tony@atomide.com>
Wed, 4 Jul 2012 07:54:34 +0000
(
00:54
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 4 Jul 2012 07:54:34 +0000
(
00:54
-0700)
$ git checkout -b tmp-rebuild-
1341388456
linus
$ git merge -m "Merge fixes fixes-non-critical testing-misc tmp-merge testing-board cbus" fixes fixes-non-critical testing-misc tmp-merge testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1341388456
To view the changes since the last rebuild, please do
$ git diff
b28e9deb977970155501ad2f981e4471cd40b67a
..
88ab5a04b80780b4b7941f9f2cba37a40127a933
arch/arm/*omap*/
Trivial merge