git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
92139f8
ac4a0b3
)
Linux-omap rebuilt: Merged in updated omap-for-linus and USB fixes
author
Tony Lindgren
<tony@atomide.com>
Tue, 24 May 2011 07:54:37 +0000
(
00:54
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 24 May 2011 07:54:37 +0000
(
00:54
-0700)
$ git checkout -b tmp-rebuild-
1306223666
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-
1306223666
To view the changes since the last rebuild, please do
$ git diff
ac4a0b3d4cbf423c9040e6868ef222248cbe6dc4
..
92139f8923979c156af04abb3e0423bfaa8d0d72
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1306223666
Trivial merge