git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b376cb8
f83c2a8
)
Linux-omap rebuilt: Merged in the first round of patches based on devel-stable
author
Tony Lindgren
<tony@atomide.com>
Thu, 8 Dec 2011 01:15:51 +0000
(17:15 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 8 Dec 2011 01:15:51 +0000
(17:15 -0800)
$ git checkout -b tmp-rebuild-
1323306935
linus
$ git merge -m "Merge fixes fixes-non-critical cleanup dt soc board testing-board testing-misc cbus" fixes fixes-non-critical cleanup dt soc board testing-board testing-misc cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1323306935
To view the changes since the last rebuild, please do
$ git diff
f83c2a8cbb59981722d1ab610c79adfd034a2667
..
b376cb8c7ed36c6258314d2d369837c38f839b28
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1323306935
Trivial merge