diff options
| author | David S. Miller | 2011-11-26 20:47:03 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-11-26 20:47:03 +0100 |
| commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
| tree | cd71e597bbbe677820bb229c6aedbad412758959 /mm/madvise.c | |
| 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 | kernel-qcow2-linux-6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c.tar.gz kernel-qcow2-linux-6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c.tar.xz kernel-qcow2-linux-6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
Diffstat (limited to 'mm/madvise.c')
0 files changed, 0 insertions, 0 deletions