diff options
author | David S. Miller <davem@davemloft.net> | 2015-02-11 19:48:14 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-11 19:48:14 -0800 |
commit | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (patch) | |
tree | 3423eb92315865d76cb8d488513bfef6ab9251d0 /drivers/power/reset/Makefile | |
parent | e09dcd2e7913aa50b5cb4836bc1e990e429e4aff (diff) | |
parent | 59d53737a8640482995fea13c6e2c0fd016115d6 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
I pushed a version of the crypto iov_iter bug fix that
Al Viro wrote, but Linus put in a different copy of the
same fix into his tree.
I then reverted my commit in net-next, and that's why we have a merge
when pulling in Linus's tree.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/power/reset/Makefile')
-rw-r--r-- | drivers/power/reset/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile index 1d4804d6b323..11de15bae52e 100644 --- a/drivers/power/reset/Makefile +++ b/drivers/power/reset/Makefile @@ -11,10 +11,10 @@ obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o obj-$(CONFIG_POWER_RESET_LTC2952) += ltc2952-poweroff.o obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o -obj-$(CONFIG_POWER_RESET_SUN6I) += sun6i-reboot.o obj-$(CONFIG_POWER_RESET_ST) += st-poweroff.o obj-$(CONFIG_POWER_RESET_VERSATILE) += arm-versatile-reboot.o obj-$(CONFIG_POWER_RESET_VEXPRESS) += vexpress-poweroff.o obj-$(CONFIG_POWER_RESET_XGENE) += xgene-reboot.o obj-$(CONFIG_POWER_RESET_KEYSTONE) += keystone-reset.o obj-$(CONFIG_POWER_RESET_SYSCON) += syscon-reboot.o +obj-$(CONFIG_POWER_RESET_RMOBILE) += rmobile-reset.o |