tree 4bebc92c83785335e132059d9965c8f9c0a03670
parent 0f0836b7eb1b9d14862ee40c7856227a3ead70db
parent bcf4299e6215a475259c3ac329d43e776cfe9c0c
author Linus Torvalds <torvalds@linux-foundation.org> 1452819859 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1452819859 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  floppy: make local variable non-static
  exynos: fixes an incorrect header guard
  dt-bindings: fixes some incorrect header guards
  cpufreq-dt: correct dead link in documentation
  cpufreq: ARM big LITTLE: correct dead link in documentation
  treewide: Fix typos in printk
  Documentation: filesystem: Fix typo in fs/eventfd.c
  fs/super.c: use && instead of & for warn_on condition
  Documentation: fix sysfs-ptp
  lib: scatterlist: fix Kconfig description