diff options
| author | David S. Miller | 2009-02-07 11:52:44 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-02-07 11:52:44 +0100 |
| commit | 409f0a9014fe24d906ba21aaccff80eb7f7304da (patch) | |
| tree | 8d9a6946d6cf1c5aab72651a193ff860651e5e65 /include/linux/skbuff.h | |
| parent | igb: remove dead code in transmit routine (diff) | |
| parent | sunhme: Don't match PCI devices in SBUS probe. (diff) | |
| download | kernel-qcow2-linux-409f0a9014fe24d906ba21aaccff80eb7f7304da.tar.gz kernel-qcow2-linux-409f0a9014fe24d906ba21aaccff80eb7f7304da.tar.xz kernel-qcow2-linux-409f0a9014fe24d906ba21aaccff80eb7f7304da.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'include/linux/skbuff.h')
0 files changed, 0 insertions, 0 deletions