diff options
| author | Abhishek Ranjan <aranja@codeaurora.org> | 2015-02-27 10:20:49 +0530 |
|---|---|---|
| committer | Abhishek Ranjan <aranja@codeaurora.org> | 2015-02-27 10:20:49 +0530 |
| commit | 9d6021d65a2e91c4271721f7a04c8c163496abd7 (patch) | |
| tree | c7d08af12db61415c8d53f9f6bd1557fb69d8656 /include/linux | |
| parent | 29165c4cc33ebdbde65e85c4ada6fb9affb7935c (diff) | |
| parent | 60b255677d827cdc97bf5d1edbdb95f4c28043e4 (diff) | |
| download | qcom-msm-v3.10-9d6021d65a2e91c4271721f7a04c8c163496abd7.tar.gz | |
Merge commit '60b255677d827cdc97bf5d1edbdb95f4c28043e4'
Conflicts:
drivers/platform/msm/qpnp-power-on.c
include/linux/qpnp/power-on.h
Change-Id: Id285843733d3d11bd4c37212ec66b44130896d1e
Signed-off-by: Abhishek Ranjan <aranja@codeaurora.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/qpnp/power-on.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/qpnp/power-on.h b/include/linux/qpnp/power-on.h index e46104a8006..a80e0c9a05e 100644 --- a/include/linux/qpnp/power-on.h +++ b/include/linux/qpnp/power-on.h @@ -1,5 +1,4 @@ -/* - * Copyright (c) 2012-2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and |