git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
73b95cc
dae50da
)
Linux-omap rebuilt: Updated to -rc3, merged in fixes
author
Tony Lindgren
<tony@atomide.com>
Wed, 2 Feb 2011 01:15:28 +0000
(17:15 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 2 Feb 2011 01:15:28 +0000
(17:15 -0800)
$ git checkout -b tmp-rebuild-
1296609320
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-
1296609320
To view the changes since the last rebuild, please do
$ git diff
dae50dac711cfc55478f01c627eadf1d29f15eab
..
73b95cc28fa4006d4cd1296a7c296bbad249c4c9
arch/arm/*omap*/
Trivial merge