diff options
| author | David S. Miller | 2012-02-11 05:32:28 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-02-11 05:32:28 +0100 |
| commit | d5ef8a4d87ab21d575ac86366599c9152a28028d (patch) | |
| tree | 8b1be85ad1af7ee6a0e3e36c77ae738c966c1f21 /include/linux/if_cablemodem.h | |
| parent | igb: fix warning about unused function (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-d5ef8a4d87ab21d575ac86366599c9152a28028d.tar.gz kernel-qcow2-linux-d5ef8a4d87ab21d575ac86366599c9152a28028d.tar.xz kernel-qcow2-linux-d5ef8a4d87ab21d575ac86366599c9152a28028d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/infiniband/hw/nes/nes_cm.c
Simple whitespace conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_cablemodem.h')
0 files changed, 0 insertions, 0 deletions