summaryrefslogtreecommitdiff
path: root/net/ieee802154
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-12-19 16:23:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-20 09:48:47 -0800
commit50f4d9bda9f8510db1392b4e832fca95c56295a1 (patch)
treefa35f06095dfe989c129168dd17d13ca7d7371e2 /net/ieee802154
parent1b011e2f13fcf37e1e577fed25b295808d6c83b9 (diff)
printk: fix typo in CONSOLE_LOGLEVEL_DEFAULT help text
s/prink/printk/ Link: http://lkml.kernel.org/r/20161215170111.19075-1-bp@alien8.de Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Olof Johansson <olof@lixom.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/ieee802154')
0 files changed, 0 insertions, 0 deletions
0ce'>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 'include/trace/events/intel-sst.h')