summaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_output.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-21 08:13:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-21 08:13:55 -0700
commit0b887ef19d7319263f31babc2a7855bc92865c0e (patch)
treeeb9aaed5f530a5ad3c9cd28cbec1fade63a993a9 /net/ipv4/xfrm4_output.c
parent44040f107e64d689ccd3211ac62c6bc44f3f0775 (diff)
parentde75c771b4cc4da963164a538a8448128301bc35 (diff)
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
* 'linux-next' of git://git.infradead.org/ubi-2.6: UBI: improve NOR flash erasure quirk UBI: introduce flash dump helper UBI: eliminate possible undefined behaviour UBI: print a warning if too many PEBs are corrupted UBI: amend NOR flash pre-erase quirk UBI: print a message if ECH is corrupted and VIDH is ok
Diffstat (limited to 'net/ipv4/xfrm4_output.c')
0 files changed, 0 insertions, 0 deletions