tree 281d93b5b3d65e832e2fe8e7ff77d89a7de7539b
parent 76d5b28bbad1c5502a24f94c2beafc468690b2ba
parent 34df117414d73cb56d128bf7016a4c151f95c313
author Linus Torvalds <torvalds@linux-foundation.org> 1469740945 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1469740945 -0700

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:
  fat: fix error message for bogus number of directory entries
  fat: fix typo s/supeblock/superblock/
  ASoC: max9877: Remove unused function declaration
  dw2102: don't output spurious blank lines to the kernel log
  init: fix Kconfig text
  ARM: io: fix comment grammar
  ocfs: fix ocfs2_xattr_user_get() argument name
  scsi/qla2xxx: Remove erroneous unused macro qla82xx_get_temp_val1()