diff options
author | 2011-11-26 14:47:03 -0500 | |
---|---|---|
committer | 2011-11-26 14:47:03 -0500 | |
commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
tree | cd71e597bbbe677820bb229c6aedbad412758959 /include/linux/netdevice.h | |
parent | Merge branch 'for_david' of git://git.open-mesh.org/linux-merge (diff) | |
parent | net: Revert ARCNET and PHYLIB to tristate options (diff) | |
download | linux-dev-6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c.tar.xz linux-dev-6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
Diffstat (limited to 'include/linux/netdevice.h')
0 files changed, 0 insertions, 0 deletions