diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-11 21:30:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-11 21:30:34 +0200 |
| commit | d122179a3c0fdc71b88cb9e3605f372b1651a9ff (patch) | |
| tree | 63a48b333e7565967b6d7c9e246557bfcb9f225f /block/blk-map.c | |
| parent | NET: pch, fix use after free (diff) | |
| parent | net: clear heap allocations for privileged ethtool actions (diff) | |
| download | linux-d122179a3c0fdc71b88cb9e3605f372b1651a9ff.tar.xz linux-d122179a3c0fdc71b88cb9e3605f372b1651a9ff.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/ethtool.c
Diffstat (limited to 'block/blk-map.c')
0 files changed, 0 insertions, 0 deletions