From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 13 Dec 2015 20:29:22 +0000 (-0800)
Subject: Merge tag 'char-misc-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f17ef4959f6281e86aa0a28c7ed615c0b86a79b5;p=people%2Fjulieng%2Flinux-arm.git

Merge tag 'char-misc-4.4-rc5' of git://git.kernel.org/pub/scm/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
---

f17ef4959f6281e86aa0a28c7ed615c0b86a79b5