git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b73d884
86d7101
)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
author
David S. Miller
<davem@davemloft.net>
Sat, 12 Sep 2009 03:35:13 +0000
(20:35 -0700)
committer
David S. Miller
<davem@davemloft.net>
Sat, 12 Sep 2009 03:35:13 +0000
(20:35 -0700)
Conflicts:
arch/sparc/Kconfig
Trivial merge