git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f3032be
c5a78ac
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
David S. Miller
<davem@davemloft.net>
Sun, 6 Jul 2008 06:08:07 +0000
(23:08 -0700)
committer
David S. Miller
<davem@davemloft.net>
Sun, 6 Jul 2008 06:08:07 +0000
(23:08 -0700)
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff