git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
18e1fab
2d37882
)
Linux-omap rebuilt: Merged in some fixes and new boards
author
Tony Lindgren
<tony@atomide.com>
Fri, 5 Nov 2010 22:06:08 +0000
(15:06 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 5 Nov 2010 22:06:08 +0000
(15:06 -0700)
$ git checkout -b tmp-rebuild-
1288994756
linus
$ git merge -m "Merge for-next omap-testing cbus" for-next omap-testing cbus
$ git pull ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git pm-hwmod-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1288994756
To view the changes since the last rebuild, please do
$ git diff
2d37882ee1762ef0078d3cafc5d483867e85e4ef
..
18e1fabc0a9d8c03ce3870f9c60e9499804e406b
arch/arm/*omap*/
Trivial merge