git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
05213a7
e3f9322
)
Linux-omap rebuilt: Updated to -rc6, merged misc fixes, sr, pm cleanup
author
Tony Lindgren
<tony@atomide.com>
Tue, 6 Mar 2012 22:51:24 +0000
(14:51 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 6 Mar 2012 22:51:24 +0000
(14:51 -0800)
$ git checkout -b tmp-rebuild-
1331074260
linus
$ git merge -m "Merge tmp-merge dt-part2 pm sr ams-delta omap4 driver i2c board testing-board testing-misc cbus" tmp-merge dt-part2 pm sr ams-delta omap4 driver i2c board testing-board testing-misc cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1331074260
To view the changes since the last rebuild, please do
$ git diff
e3f9322b9064186ab54149cb2d167804e1737eda
..
05213a72b0936ab7d57c33da1e020ab39c088a42
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1331074260
Trivial merge