summaryrefslogtreecommitdiffstats
path: root/arch/s390/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-11 14:56:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-11 14:56:41 -0800
commitb719f43059903820c31edb30f4663a2818836e7f (patch)
tree34dc6268f3b2efb62e8bcf6bcba586a291c2343b /arch/s390/Makefile
parentc727b4c63c9bf33c65351bbcc738161edb444b24 (diff)
parent08245ad87e2970ac56987caab5cd5900563db4e1 (diff)
downloadtalos-obmc-linux-b719f43059903820c31edb30f4663a2818836e7f.tar.gz
talos-obmc-linux-b719f43059903820c31edb30f4663a2818836e7f.zip
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull a hwmon patch from Guenter Roeck: "Fix build error in vexpress driver" * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (vexpress) Fix build error seen if CONFIG_OF_DEVICE is not set
Diffstat (limited to 'arch/s390/Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud