git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
10e7661
6317139
)
Linux-omap rebuilt: Changes merged for nand, onenand, boards
author
Tony Lindgren
<tony@atomide.com>
Fri, 18 Feb 2011 00:25:12 +0000
(16:25 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 18 Feb 2011 00:25:12 +0000
(16:25 -0800)
$ git checkout -b tmp-rebuild-
1297988511
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-
1297988511
To view the changes since the last rebuild, please do
$ git diff
63171390a0e8a70ecfb8255215caed857346c478
..
10e76616840d50b459378a9e0d7ffb9ae9662217
arch/arm/*omap*/
Trivial merge