git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5498ee1
13758fa
)
Linux-omap rebuilt: Merged in omap4 and sparse fixes
author
Tony Lindgren
<tony@atomide.com>
Fri, 24 Sep 2010 23:13:17 +0000
(16:13 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 24 Sep 2010 23:13:17 +0000
(16:13 -0700)
$ git checkout -b tmp-rebuild-
1285369960
linus
$ git merge -m "Merge cbus" cbus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1285369960
To view the changes since the last rebuild, please do
$ git diff
13758fa0e598b575e2623fffb88bfbb67b97e903
..
5498ee1c038ea5ffc5240166d625a1e6aa15cbf8
arch/arm/*omap*/
Trivial merge