git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ca21477
f64582b
)
Linux-omap rebuilt: Updated to -rc1, merged pending fixes and clean-up
author
Tony Lindgren
<tony@atomide.com>
Thu, 20 Jan 2011 01:22:47 +0000
(17:22 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 20 Jan 2011 01:22:47 +0000
(17:22 -0800)
$ git checkout -b tmp-rebuild-
1295486559
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-
1295486559
To view the changes since the last rebuild, please do
$ git diff
f64582bb94069e7fdfdaa0294fc30e278f5e47cd
..
ca214772ddfe5720ce402c64c27ab27243d5734b
arch/arm/*omap*/
Trivial merge