git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
47816c7
6bda016
)
Linux-omap rebuilt: Updated to -rc2, merged mux changes
author
Tony Lindgren
<tony@atomide.com>
Tue, 16 Nov 2010 21:41:35 +0000
(13:41 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 16 Nov 2010 21:41:35 +0000
(13:41 -0800)
$ git checkout -b tmp-rebuild-
1289943688
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-
1289943688
To view the changes since the last rebuild, please do
$ git diff
6bda016276c5e17996291dfb99673e996571ee0d
..
47816c73db50e1fc437ad53295f38ac63bb20202
arch/arm/*omap*/
Trivial merge