git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9f7bef3
07735c3
)
Linux-omap rebuilt: Updated to v3.0-rc1
author
Tony Lindgren
<tony@atomide.com>
Tue, 31 May 2011 13:57:10 +0000
(06:57 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 31 May 2011 13:57:10 +0000
(06:57 -0700)
$ git checkout -b tmp-rebuild-
1306850196
linus
$ git merge -m "Merge devel-fixes devel-board omap-testing cbus testing-i2c" devel-fixes devel-board omap-testing cbus testing-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1306850196
To view the changes since the last rebuild, please do
$ git diff
07735c34d28a496f6372725390e9a7e91f3abdc4
..
9f7bef3f61af8dba0e782dcbfc78bde5c13f33d1
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1306850196
Trivial merge