From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Jan 2010 15:36:31 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
X-Git-Tag: firefly_0821_release~9833^2~3316
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f8c7e6c2038a96f427911264a0c1448c9e3c2a9e;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  Revert "sysdev: fix prototype for memory_sysdev_class show/store functions"
  driver-core: fix devtmpfs crash on s390
---

f8c7e6c2038a96f427911264a0c1448c9e3c2a9e