From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Jun 2015 05:37:45 +0000 (-0700)
Subject: Merge tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~1674
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=37ef1647b7f73d4ff4c7993984599b6c4f26443a;p=firefly-linux-kernel-4.4.55.git

Merge tag 'driver-core-4.1-rc7' of git://git./linux/kernel/git/gregkh/driver-core

Pull driver core fixes from Greg KH:
 "Here are two fixes for the driver core that resolve some reported
  issues.

  One is a regression from 4.0, the other a fixes a reported oops that
  has been there since 3.19.

  Both have been in linux-next for a while with no problems"

* tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  drivers/base: cacheinfo: handle absence of caches
  drivers: of/base: move of_init to driver_init
---

37ef1647b7f73d4ff4c7993984599b6c4f26443a