git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
817bc4d
ef85004
)
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
author
David S. Miller
<davem@davemloft.net>
Sun, 23 Mar 2008 01:22:42 +0000
(18:22 -0700)
committer
David S. Miller
<davem@davemloft.net>
Sun, 23 Mar 2008 01:22:42 +0000
(18:22 -0700)
Conflicts:
drivers/s390/net/qeth_main.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff