git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4aa3a71
5629937
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
David S. Miller
<davem@davemloft.net>
Tue, 21 Jun 2011 05:29:08 +0000
(22:29 -0700)
committer
David S. Miller
<davem@davemloft.net>
Tue, 21 Jun 2011 05:29:08 +0000
(22:29 -0700)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff