git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a97d643
fa3b4e2
)
Linux-omap rebuilt: Updated to current mainline with pending fixes
author
Tony Lindgren
<tony@atomide.com>
Tue, 18 Jan 2011 22:45:20 +0000
(14:45 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 18 Jan 2011 22:45:20 +0000
(14:45 -0800)
$ git checkout -b tmp-rebuild-
1295390711
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-
1295390711
To view the changes since the last rebuild, please do
$ git diff
fa3b4e23ec20cfc944db7cc2b30b0d82c20e4472
..
a97d643e5cc522dddb6b8884269a96236df757da
arch/arm/*omap*/
Trivial merge