diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-30 20:05:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-30 20:05:54 -0700 |
| commit | ccda4a77f3a5976e4f064eddce11faec54d1f1e0 (patch) | |
| tree | b704a24839eaf1bec5c9f944abbd294e0eb8573d /net/hsr/hsr_framereg.h | |
| parent | 7fc527f96bc57a5cb87bf78e8535bb85ad372995 (diff) | |
| parent | 1759389e8af46d724220785bf710b7bdbebdfa48 (diff) | |
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 2014-07-30
This is the last pull request for ipsec-next before I'll be
off for two weeks starting on friday. David, can you please
take urgent ipsec patches directly into net/net-next during
this time?
1) Error handling simplifications for vti and vti6.
From Mathias Krause.
2) Remove a duplicate semicolon after a return statement.
From Christoph Paasch.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr/hsr_framereg.h')
0 files changed, 0 insertions, 0 deletions