diff options
| author | David S. Miller <davem@davemloft.net> | 2013-11-02 06:13:48 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-02 06:13:48 (GMT) |
| commit | 296c10639a33941d0090afa17b7535fcbf81d97a (patch) | |
| tree | f85819ef71b07bcf004c7971fa66c9f68a45bd74 /include/linux/tty_ldisc.h | |
| parent | e139862eeec985d7139b11b09deeb9a32e3f3af2 (diff) | |
| parent | 1c5ad13f7c2b2afe30e43858d04fff979dc9d243 (diff) | |
| download | linux-fsl-qoriq-296c10639a33941d0090afa17b7535fcbf81d97a.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Conflicts:
net/xfrm/xfrm_policy.c
Minor merge conflict in xfrm_policy.c, consisting of overlapping
changes which were trivial to resolve.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/tty_ldisc.h')
0 files changed, 0 insertions, 0 deletions