git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
389b361
25766d3
)
Linux-omap rebuilt: Updated to -rc5, merged in updated iomap patches
author
Tony Lindgren
<tony@atomide.com>
Wed, 29 Feb 2012 01:00:52 +0000
(17:00 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 29 Feb 2012 01:00:52 +0000
(17:00 -0800)
$ git checkout -b tmp-rebuild-
1330477230
linus
$ git merge -m "Merge fixes tmp-merge soc hwmod pm omap1 omap4 driver i2c board testing-board testing-misc cbus" fixes tmp-merge soc hwmod pm omap1 omap4 driver i2c board testing-board testing-misc cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1330477230
To view the changes since the last rebuild, please do
$ git diff
25766d3b91d3d7eb6b966f370beea6abc8410bd3
..
389b36151a0f9e7677b6f4f0661838ac86848491
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1330477230
Trivial merge