Merge tag 'char-misc-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Dec 2015 20:29:22 +0000 (12:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Dec 2015 20:29:22 +0000 (12:29 -0800)
commitf17ef4959f6281e86aa0a28c7ed615c0b86a79b5
tree085d0cdb750bce1aa088c05f9124dec6393f4d7f
parentb24f74e3208ff7a6b360d6f1a3ef252f3a910827
parente8c77bda05e5d93cce6f38cfdde4192307951dea
Merge tag 'char-misc-4.4-rc5' of git://git./linux/kernel/git/gregkh/char-misc

Pull fpga driver fixes from Greg KH:
 "Only two small fpga driver fixes here, both have been in linux-next
  for a while, and resolve some reported issues"

* tag 'char-misc-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  fpga manager: Fix firmware resource leak on error
  fpga manager: remove label