diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-11 23:56:41 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-11 23:56:41 +0100 |
commit | b719f43059903820c31edb30f4663a2818836e7f (patch) | |
tree | 34dc6268f3b2efb62e8bcf6bcba586a291c2343b /drivers/ata/libata-eh.c | |
parent | Merge branch 'akpm' (incoming fixes from Andrew) (diff) | |
parent | hwmon: (vexpress) Fix build error seen if CONFIG_OF_DEVICE is not set (diff) | |
download | linux-b719f43059903820c31edb30f4663a2818836e7f.tar.xz 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 'drivers/ata/libata-eh.c')
0 files changed, 0 insertions, 0 deletions