git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
175c2d2
5baa1ce
)
Linux-omap rebuilt: Merged fixes, genirq, cleanup
author
Tony Lindgren
<tony@atomide.com>
Wed, 20 Apr 2011 16:03:05 +0000
(09:03 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 20 Apr 2011 16:03:05 +0000
(09:03 -0700)
$ git checkout -b tmp-rebuild-
1303315376
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-
1303315376
To view the changes since the last rebuild, please do
$ git diff
3b083450b3e0709690362374367656e9cb0e66d3
..
175c2d2b17842bd0869ec95952e8190f75b37eed
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1303315376
Trivial merge