git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d0136a
4e3a629
)
Linux-omap rebuilt: Updated to -rc3
author
Tony Lindgren
<tony@atomide.com>
Mon, 18 Apr 2011 08:14:00 +0000
(
01:14
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 18 Apr 2011 08:14:00 +0000
(
01:14
-0700)
$ git checkout -b tmp-rebuild-
1303114429
linus
$ git merge -m "Merge for-next omap-testing cbus testing-i2c" for-next omap-testing cbus testing-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1303114429
To view the changes since the last rebuild, please do
$ git diff
4e3a629fa111b8ed2b0c89032f115b570f3756bf
..
5d0136afddee5c005c50a17e75b2cb843ba7659e
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1303114429
Trivial merge