From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Mar 2015 19:03:14 +0000 (-0700)
Subject: Merge tag 'char-misc-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b93dbeea7b0d2d24485e2cd8075adcac7f65dd4c;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'char-misc-4.0-rc5' of git://git./linux/kernel/git/gregkh/char-misc

Pull char/misc fixes from Greg KH:
 "Here are three fixes for 4.0-rc5 that revert 3 PCMCIA patches that
  were merged in 4.0-rc1 that cause regressions.  So let's revert them
  for now and they will be reworked and resent sometime in the future.

  All have been tested in linux-next for a while"

* tag 'char-misc-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  Revert "pcmcia: add a new resource manager for non ISA systems"
  Revert "pcmcia: fix incorrect bracketing on a test"
  Revert "pcmcia: add missing include for new pci resource handler"
---

b93dbeea7b0d2d24485e2cd8075adcac7f65dd4c