git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2151317
9be20f0
)
Linux-omap rebuilt: Merged zImage fixes, more cleanup
author
Tony Lindgren
<tony@atomide.com>
Tue, 3 May 2011 11:45:03 +0000
(
04:45
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 3 May 2011 11:45:03 +0000
(
04:45
-0700)
$ git checkout -b tmp-rebuild-
1304423090
linus
$ git merge -m "Merge for-next omap-testing cbus testing-i2c" for-next omap-testing cbus testing-i2c
$ git pull git://git.linaro.org/people/nico/linux zImage_fixes
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1304423090
To view the changes since the last rebuild, please do
$ git diff
9be20f07688611eff97d9d0f2ffdf146a47a2f4e
..
2151317c06b43efb83ec4390039b47f2b63deea5
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1304423090
Trivial merge