git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
28633c5
369bd00
)
Linux-omap rebuilt: Updated to use omap_sdrc_init
author
Tony Lindgren
<tony@atomide.com>
Wed, 24 Aug 2011 13:41:39 +0000
(06:41 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 24 Aug 2011 13:41:39 +0000
(06:41 -0700)
$ git checkout -b tmp-rebuild-
1314193288
linus
$ git merge -m "Merge fixes cleanup board testing-misc testing-board cbus" fixes cleanup board testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1314193288
To view the changes since the last rebuild, please do
$ git diff
369bd00d5eb46eea7756e4440ea958880ecf62b0
..
28633c5275b4b9b05fe4e53a0405b3b6d7aeb48c
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1314193288
Trivial merge