git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7be6065
13d428a
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
David S. Miller
<davem@davemloft.net>
Fri, 21 Nov 2008 00:44:00 +0000
(16:44 -0800)
committer
David S. Miller
<davem@davemloft.net>
Fri, 21 Nov 2008 00:44:00 +0000
(16:44 -0800)
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
include/net/mac80211.h
net/phonet/af_phonet.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff