summaryrefslogtreecommitdiff
path: root/curvetun/nacl_build.sh
diff options
context:
space:
mode:
Diffstat (limited to 'curvetun/nacl_build.sh')
0 files changed, 0 insertions, 0 deletions
tr> tree02f6ffa664b16bd76750c05f62708a518de2acdc /net/batman-adv/tvlv.h parent08965c2eba135bdfb6e86cf25308e01421c7e0ce (diff)parent3b4f18843e511193e7eb616710e838f5852e661d (diff)
Merge branch 'stable/for-jens-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes: Please pull in your 'for-linus' branch two little fixes for Xen block front: One fix is for handling the XEN_PAGE_SIZE != PAGE_SIZE (4KB vs 64KB on ARM for example) mishandling while the other is fixing the accounting for the configuration changes.
Diffstat (limited to 'net/batman-adv/tvlv.h')