diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-26 05:29:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-26 05:29:51 +0300 |
| commit | 7bed14551659875e1cd23a7c0266394a29a773b3 (patch) | |
| tree | 2bbd8b1b2b1610d2e48a71bf7bb5f41ac5e1d0ef /drivers/scsi/aha1542.c | |
| parent | b8392808eb3fc28e523e28cb258c81ca246deb9b (diff) | |
| parent | 4a21185cda0fbb860580eeeb4f1a70a9cda332a4 (diff) | |
| download | linux-7bed14551659875e1cd23a7c0266394a29a773b3.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes in xfrm_device.c, between the double
ESP trailing bug fix setting the XFRM_INIT flag and the changes
in net-next preparing for bonding encryption support.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/aha1542.c')
0 files changed, 0 insertions, 0 deletions