git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7a29bfe
c7769fd
)
Linux-omap rebuilt: Updated with compile warning fixes
author
Tony Lindgren
<tony@atomide.com>
Fri, 27 May 2011 11:06:18 +0000
(
04:06
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 27 May 2011 11:06:18 +0000
(
04:06
-0700)
$ git checkout -b tmp-rebuild-
1306494358
linus
$ git merge -m "Merge for-next omap-testing cbus testing-i2c devel-fixes" for-next omap-testing cbus testing-i2c devel-fixes
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1306494358
To view the changes since the last rebuild, please do
$ git diff
c7769fdf6a9c87c6c3ddca0103566eabc5e4db01
..
7a29bfe82525940cc662f32c1013a757dbaa1caf
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1306494358
Trivial merge