git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
42fa072
492c2e4
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Mon, 12 May 2008 17:04:54 +0000
(10:04 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 12 May 2008 17:04:54 +0000
(10:04 -0700)
Merge branches 'master' and 'linus'
1
2
Makefile
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Makefile
Simple merge
diff --cc
drivers/net/Kconfig
Simple merge