summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-10-28 13:26:27 -0400
committerDavid S. Miller <davem@davemloft.net>2016-10-28 13:26:27 -0400
commit1d0057883626a004365537dff741b31eaf9e27a4 (patch)
tree46bf045c3fcc79e358d566c4dbb366df2caf1ada /kernel
parent002d8a1a6c11b9b2a8ac615095589111dd52749b (diff)
parent2258d927a691ddd2ab585adb17ea9f96e89d0638 (diff)
downloadop-kernel-dev-1d0057883626a004365537dff741b31eaf9e27a4.zip
op-kernel-dev-1d0057883626a004365537dff741b31eaf9e27a4.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says: ==================== pull request (net-next): ipsec-next 2016-10-25 Just a leftover from the last development cycle. 1) Remove some unused code, from Florian Westphal. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud