git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d57fe4a
01b3a11
)
Linux-omap rebuilt: Updated to -rc7
author
Tony Lindgren
<tony@atomide.com>
Thu, 3 Mar 2011 01:29:04 +0000
(17:29 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 3 Mar 2011 01:29:04 +0000
(17:29 -0800)
$ git checkout -b tmp-rebuild-
1299115737
linus
$ git merge -m "Merge for-next omap-testing cbus" for-next omap-testing cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1299115737
To view the changes since the last rebuild, please do
$ git diff
a97807f767c100cdec5f5fb36618f2df4b67509c
..
d57fe4a4622e98febb6a6c02b7b5ba5054a1d482
arch/arm/*omap*/
Trivial merge