Merge tag 'pm+acpi-4.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

30f05309 · Linus Torvalds <[email protected]> · 2016-01-20 19:06:49 -08:00

Pull more power management and ACPI updates from Rafael Wysocki:
 "This includes fixes on top of the previous batch of PM+ACPI updates
  and some new material as well.

  From the new material perspective the most significant are the driver
  core changes that should allow USB devices to stay suspended over
  system suspend/resume cycles if they have been runtime-suspended
  already beforehand.  Apart from that, ACPICA is updated to upstream
  revision 20160108 (cosmetic mostly, but including one fixup on top of
  the previous ACPICA update) and there are some devfreq updates the
  didn't make it before (due to timing).

  A few recent regressions are fixed, most importantly in the cpuidle
  menu governor and in the ACPI backlight driver and some x86 platform
  drivers depending on it.

  Some more bugs are fixed and cleanups are made on top of that.

  Specifics:

   - Modify the driver core and the USB subsystem to allow USB devices
     to stay suspended over system suspend/resume cycles if they have
     been runtime-suspended already beforehand and fix some bugs on top
     of these changes (Tomeu Vizoso, Rafael Wysocki).

   - Update ACPICA to upstream revision 20160108, including updates of
     the ACPICA's copyright notices, a code fixup resulting from a
     regression fix that was necessary in the upstream code only (the
     regression fixed by it has never been present in Linux) and a
     compiler warning fix (Bob Moore, Lv Zheng).

   - Fix a recent regression in the cpuidle menu governor that broke it
     on practically all architectures other than x86 and make a couple
     of optimizations on top of that fix (Rafael Wysocki).

   - Clean up the selection of cpuidle governors depending on whether or
     not the kernel is configured for tickless systems (Jean Delvare).

   - Revert a recent commit that introduced a regression in the ACPI
     backlight driver, address the problem it attempted to fix in a
     different way and revert one more cosmetic change depending on the
     problematic commit (Hans de Goede).

   - Add two more ACPI backlight quirks (Hans de Goede).

   - Fix a few minor problems in the core devfreq code, clean it up a
     bit and update the MAINTAINERS information related to it (Chanwoo
     Choi, MyungJoo Ham).

   - Improve an error message in the ACPI fan driver (Andy Lutomirski).

   - Fix a recent build regression in the cpupower tool (Shreyas
     Prabhu)"

* tag 'pm+acpi-4.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (32 commits)
  cpuidle: menu: Avoid pointless checks in menu_select()
  sched / idle: Drop default_idle_call() fallback from call_cpuidle()
  cpupower: Fix build error in cpufreq-info
  cpuidle: Don't enable all governors by default
  cpuidle: Default to ladder governor on ticking systems
  time: nohz: Expose tick_nohz_enabled
  ACPICA: Update version to 20160108
  ACPICA: Silence a -Wbad-function-cast warning when acpi_uintptr_t is 'uintptr_t'
  ACPICA: Additional 2016 copyright changes
  ACPICA: Reduce regression fix divergence from upstream ACPICA
  ACPI / video: Add disable_backlight_sysfs_if quirk for the Toshiba Satellite R830
  ACPI / video: Revert "thinkpad_acpi: Use acpi_video_handles_brightness_key_presses()"
  ACPI / video: Document acpi_video_handles_brightness_key_presses() a bit
  ACPI / video: Fix using an uninitialized mutex / list_head in acpi_video_handles_brightness_key_presses()
  ACPI / video: Revert "ACPI / video: driver must be registered before checking for keypresses"
  ACPI / fan: Improve acpi_device_update_power error message
  ACPI / video: Add disable_backlight_sysfs_if quirk for the Toshiba Portege R700
  cpuidle: menu: Fix menu_select() for CPUIDLE_DRIVER_STATE_START == 0
  MAINTAINERS: Add devfreq-event entry
  MAINTAINERS: Add missing git repository and directory for devfreq
  ...

Commit: 30f05309bde49295e02e45c7e615f73aa4e0ccc2
Parents: 3549d822 · db2b52f7

Merge commit. Changes below are compared with the first parent: 3549d822.

Changes

257 files changed · +516 −326

File	Status	Add	Del	Content
MAINTAINERS	modified	+13	−0	View file
arch/arm/mach-omap2/omap_device.c	modified	+4	−3	View file
drivers/acpi/acpi_lpss.c	modified	+4	−1	View file
drivers/acpi/acpi_video.c	modified	+33	−19	View file
drivers/acpi/acpica/acapps.h	modified	+2	−2	View file
drivers/acpi/acpica/accommon.h	modified	+1	−1	View file
drivers/acpi/acpica/acdebug.h	modified	+1	−1	View file
drivers/acpi/acpica/acdispat.h	modified	+1	−1	View file
drivers/acpi/acpica/acevents.h	modified	+1	−1	View file
drivers/acpi/acpica/acglobal.h	modified	+1	−1	View file
drivers/acpi/acpica/achware.h	modified	+1	−1	View file
drivers/acpi/acpica/acinterp.h	modified	+1	−1	View file
drivers/acpi/acpica/aclocal.h	modified	+1	−1	View file
drivers/acpi/acpica/acmacros.h	modified	+1	−1	View file
drivers/acpi/acpica/acnamesp.h	modified	+1	−1	View file
drivers/acpi/acpica/acobject.h	modified	+1	−1	View file
drivers/acpi/acpica/acopcode.h	modified	+1	−1	View file
drivers/acpi/acpica/acparser.h	modified	+1	−1	View file
drivers/acpi/acpica/acpredef.h	modified	+1	−1	View file
drivers/acpi/acpica/acresrc.h	modified	+1	−1	View file
drivers/acpi/acpica/acstruct.h	modified	+1	−1	View file
drivers/acpi/acpica/actables.h	modified	+1	−1	View file
drivers/acpi/acpica/acutils.h	modified	+1	−1	View file
drivers/acpi/acpica/amlcode.h	modified	+1	−1	View file
drivers/acpi/acpica/amlresrc.h	modified	+1	−1	View file
drivers/acpi/acpica/dbcmds.c	modified	+1	−1	View file
drivers/acpi/acpica/dbconvert.c	modified	+1	−1	View file
drivers/acpi/acpica/dbdisply.c	modified	+4	−2	View file
drivers/acpi/acpica/dbexec.c	modified	+1	−1	View file
drivers/acpi/acpica/dbfileio.c	modified	+1	−1	View file
drivers/acpi/acpica/dbhistry.c	modified	+1	−1	View file
drivers/acpi/acpica/dbinput.c	modified	+1	−1	View file
drivers/acpi/acpica/dbmethod.c	modified	+1	−1	View file
drivers/acpi/acpica/dbnames.c	modified	+1	−1	View file
drivers/acpi/acpica/dbobject.c	modified	+1	−1	View file
drivers/acpi/acpica/dbstats.c	modified	+1	−1	View file
drivers/acpi/acpica/dbtest.c	modified	+1	−1	View file
drivers/acpi/acpica/dbutils.c	modified	+1	−1	View file
drivers/acpi/acpica/dbxface.c	modified	+1	−1	View file
drivers/acpi/acpica/dsargs.c	modified	+1	−1	View file
drivers/acpi/acpica/dscontrol.c	modified	+1	−1	View file
drivers/acpi/acpica/dsdebug.c	modified	+1	−1	View file
drivers/acpi/acpica/dsfield.c	modified	+1	−1	View file
drivers/acpi/acpica/dsinit.c	modified	+1	−1	View file
drivers/acpi/acpica/dsmethod.c	modified	+1	−1	View file
drivers/acpi/acpica/dsmthdat.c	modified	+1	−1	View file
drivers/acpi/acpica/dsobject.c	modified	+1	−1	View file
drivers/acpi/acpica/dsopcode.c	modified	+1	−1	View file
drivers/acpi/acpica/dsutils.c	modified	+1	−1	View file
drivers/acpi/acpica/dswexec.c	modified	+1	−1	View file
drivers/acpi/acpica/dswload.c	modified	+1	−1	View file
drivers/acpi/acpica/dswload2.c	modified	+1	−1	View file
drivers/acpi/acpica/dswscope.c	modified	+1	−1	View file
drivers/acpi/acpica/dswstate.c	modified	+1	−1	View file
drivers/acpi/acpica/evevent.c	modified	+1	−1	View file
drivers/acpi/acpica/evglock.c	modified	+1	−1	View file
drivers/acpi/acpica/evgpe.c	modified	+1	−1	View file
drivers/acpi/acpica/evgpeblk.c	modified	+1	−1	View file
drivers/acpi/acpica/evgpeinit.c	modified	+1	−1	View file
drivers/acpi/acpica/evgpeutil.c	modified	+1	−1	View file
drivers/acpi/acpica/evhandler.c	modified	+1	−1	View file
drivers/acpi/acpica/evmisc.c	modified	+1	−1	View file
drivers/acpi/acpica/evregion.c	modified	+1	−1	View file
drivers/acpi/acpica/evrgnini.c	modified	+1	−1	View file
drivers/acpi/acpica/evsci.c	modified	+1	−1	View file
drivers/acpi/acpica/evxface.c	modified	+1	−1	View file
drivers/acpi/acpica/evxfevnt.c	modified	+1	−1	View file
drivers/acpi/acpica/evxfgpe.c	modified	+1	−1	View file
drivers/acpi/acpica/evxfregn.c	modified	+1	−1	View file
drivers/acpi/acpica/exconfig.c	modified	+1	−1	View file
drivers/acpi/acpica/exconvrt.c	modified	+1	−1	View file
drivers/acpi/acpica/excreate.c	modified	+1	−1	View file
drivers/acpi/acpica/exdebug.c	modified	+1	−1	View file
drivers/acpi/acpica/exdump.c	modified	+1	−1	View file
drivers/acpi/acpica/exfield.c	modified	+1	−1	View file
drivers/acpi/acpica/exfldio.c	modified	+1	−1	View file
drivers/acpi/acpica/exmisc.c	modified	+1	−1	View file
drivers/acpi/acpica/exmutex.c	modified	+1	−1	View file
drivers/acpi/acpica/exnames.c	modified	+1	−1	View file
drivers/acpi/acpica/exoparg1.c	modified	+1	−1	View file
drivers/acpi/acpica/exoparg2.c	modified	+1	−1	View file
drivers/acpi/acpica/exoparg3.c	modified	+1	−1	View file
drivers/acpi/acpica/exoparg6.c	modified	+1	−1	View file
drivers/acpi/acpica/exprep.c	modified	+1	−1	View file
drivers/acpi/acpica/exregion.c	modified	+1	−1	View file
drivers/acpi/acpica/exresnte.c	modified	+1	−1	View file
drivers/acpi/acpica/exresolv.c	modified	+1	−1	View file
drivers/acpi/acpica/exresop.c	modified	+1	−1	View file
drivers/acpi/acpica/exstore.c	modified	+1	−1	View file
drivers/acpi/acpica/exstoren.c	modified	+1	−1	View file
drivers/acpi/acpica/exstorob.c	modified	+1	−1	View file
drivers/acpi/acpica/exsystem.c	modified	+1	−1	View file
drivers/acpi/acpica/extrace.c	modified	+1	−1	View file
drivers/acpi/acpica/exutils.c	modified	+1	−1	View file
drivers/acpi/acpica/hwacpi.c	modified	+1	−1	View file
drivers/acpi/acpica/hwesleep.c	modified	+1	−1	View file
drivers/acpi/acpica/hwgpe.c	modified	+1	−1	View file
drivers/acpi/acpica/hwpci.c	modified	+1	−1	View file
drivers/acpi/acpica/hwregs.c	modified	+1	−1	View file
drivers/acpi/acpica/hwsleep.c	modified	+1	−1	View file
drivers/acpi/acpica/hwtimer.c	modified	+1	−1	View file
drivers/acpi/acpica/hwvalid.c	modified	+1	−1	View file
drivers/acpi/acpica/hwxface.c	modified	+1	−1	View file
drivers/acpi/acpica/hwxfsleep.c	modified	+1	−1	View file
drivers/acpi/acpica/nsaccess.c	modified	+1	−1	View file
drivers/acpi/acpica/nsalloc.c	modified	+1	−1	View file
drivers/acpi/acpica/nsarguments.c	modified	+1	−1	View file
drivers/acpi/acpica/nsconvert.c	modified	+1	−1	View file
drivers/acpi/acpica/nsdump.c	modified	+1	−1	View file
drivers/acpi/acpica/nsdumpdv.c	modified	+1	−1	View file
drivers/acpi/acpica/nseval.c	modified	+8	−7	View file
drivers/acpi/acpica/nsinit.c	modified	+1	−1	View file
drivers/acpi/acpica/nsload.c	modified	+1	−1	View file
drivers/acpi/acpica/nsnames.c	modified	+1	−1	View file
drivers/acpi/acpica/nsobject.c	modified	+1	−1	View file
drivers/acpi/acpica/nsparse.c	modified	+1	−1	View file
drivers/acpi/acpica/nspredef.c	modified	+1	−1	View file
drivers/acpi/acpica/nsprepkg.c	modified	+1	−1	View file
drivers/acpi/acpica/nsrepair.c	modified	+1	−1	View file
drivers/acpi/acpica/nsrepair2.c	modified	+1	−1	View file
drivers/acpi/acpica/nssearch.c	modified	+1	−1	View file
drivers/acpi/acpica/nsutils.c	modified	+1	−1	View file
drivers/acpi/acpica/nswalk.c	modified	+1	−1	View file
drivers/acpi/acpica/nsxfeval.c	modified	+1	−1	View file
drivers/acpi/acpica/nsxfname.c	modified	+1	−1	View file
drivers/acpi/acpica/nsxfobj.c	modified	+1	−1	View file
drivers/acpi/acpica/psargs.c	modified	+1	−1	View file
drivers/acpi/acpica/psloop.c	modified	+1	−1	View file
drivers/acpi/acpica/psobject.c	modified	+1	−1	View file
drivers/acpi/acpica/psopcode.c	modified	+1	−1	View file
drivers/acpi/acpica/psopinfo.c	modified	+1	−1	View file
drivers/acpi/acpica/psparse.c	modified	+1	−1	View file
drivers/acpi/acpica/psscope.c	modified	+1	−1	View file
drivers/acpi/acpica/pstree.c	modified	+1	−1	View file
drivers/acpi/acpica/psutils.c	modified	+1	−1	View file
drivers/acpi/acpica/pswalk.c	modified	+1	−1	View file
drivers/acpi/acpica/psxface.c	modified	+1	−1	View file
drivers/acpi/acpica/rsaddr.c	modified	+1	−1	View file
drivers/acpi/acpica/rscalc.c	modified	+1	−1	View file
drivers/acpi/acpica/rscreate.c	modified	+1	−1	View file
drivers/acpi/acpica/rsdump.c	modified	+1	−1	View file
drivers/acpi/acpica/rsdumpinfo.c	modified	+1	−1	View file
drivers/acpi/acpica/rsinfo.c	modified	+1	−1	View file
drivers/acpi/acpica/rsio.c	modified	+1	−1	View file
drivers/acpi/acpica/rsirq.c	modified	+1	−1	View file
drivers/acpi/acpica/rslist.c	modified	+1	−1	View file
drivers/acpi/acpica/rsmemory.c	modified	+1	−1	View file
drivers/acpi/acpica/rsmisc.c	modified	+1	−1	View file
drivers/acpi/acpica/rsserial.c	modified	+1	−1	View file
drivers/acpi/acpica/rsutils.c	modified	+1	−1	View file
drivers/acpi/acpica/rsxface.c	modified	+1	−1	View file
drivers/acpi/acpica/tbdata.c	modified	+1	−1	View file
drivers/acpi/acpica/tbfadt.c	modified	+1	−1	View file
drivers/acpi/acpica/tbfind.c	modified	+1	−1	View file
drivers/acpi/acpica/tbinstal.c	modified	+1	−1	View file
drivers/acpi/acpica/tbprint.c	modified	+1	−1	View file
drivers/acpi/acpica/tbutils.c	modified	+1	−1	View file
drivers/acpi/acpica/tbxface.c	modified	+1	−1	View file
drivers/acpi/acpica/tbxfload.c	modified	+1	−1	View file
drivers/acpi/acpica/tbxfroot.c	modified	+1	−1	View file
drivers/acpi/acpica/utaddress.c	modified	+1	−1	View file
drivers/acpi/acpica/utalloc.c	modified	+1	−1	View file
drivers/acpi/acpica/utbuffer.c	modified	+1	−1	View file
drivers/acpi/acpica/utcache.c	modified	+1	−1	View file
drivers/acpi/acpica/utcopy.c	modified	+1	−1	View file
drivers/acpi/acpica/utdebug.c	modified	+1	−1	View file
drivers/acpi/acpica/utdecode.c	modified	+1	−1	View file
drivers/acpi/acpica/utdelete.c	modified	+1	−1	View file
drivers/acpi/acpica/uterror.c	modified	+1	−1	View file
drivers/acpi/acpica/uteval.c	modified	+1	−1	View file
drivers/acpi/acpica/utexcep.c	modified	+1	−1	View file
drivers/acpi/acpica/utglobal.c	modified	+1	−1	View file
drivers/acpi/acpica/uthex.c	modified	+1	−1	View file
drivers/acpi/acpica/utids.c	modified	+1	−1	View file
drivers/acpi/acpica/utinit.c	modified	+1	−1	View file
drivers/acpi/acpica/utlock.c	modified	+1	−1	View file
drivers/acpi/acpica/utmath.c	modified	+1	−1	View file
drivers/acpi/acpica/utmisc.c	modified	+1	−1	View file
drivers/acpi/acpica/utmutex.c	modified	+1	−1	View file
drivers/acpi/acpica/utnonansi.c	modified	+1	−1	View file
drivers/acpi/acpica/utobject.c	modified	+1	−1	View file
drivers/acpi/acpica/utosi.c	modified	+1	−1	View file
drivers/acpi/acpica/utownerid.c	modified	+1	−1	View file
drivers/acpi/acpica/utpredef.c	modified	+1	−1	View file
drivers/acpi/acpica/utprint.c	modified	+1	−1	View file
drivers/acpi/acpica/utresrc.c	modified	+1	−1	View file
drivers/acpi/acpica/utstate.c	modified	+1	−1	View file
drivers/acpi/acpica/utstring.c	modified	+1	−1	View file
drivers/acpi/acpica/uttrack.c	modified	+1	−1	View file
drivers/acpi/acpica/utuuid.c	modified	+1	−1	View file
drivers/acpi/acpica/utxface.c	modified	+1	−1	View file
drivers/acpi/acpica/utxferror.c	modified	+1	−1	View file
drivers/acpi/acpica/utxfinit.c	modified	+1	−1	View file
drivers/acpi/acpica/utxfmutex.c	modified	+1	−1	View file
drivers/acpi/device_pm.c	modified	+3	−2	View file
drivers/acpi/fan.c	modified	+1	−1	View file
drivers/base/dd.c	modified	+19	−2	View file
drivers/base/platform.c	modified	+0	−1	View file
drivers/base/power/clock_ops.c	modified	+3	−2	View file
drivers/base/power/common.c	modified	+24	−0	View file
drivers/base/power/domain.c	modified	+6	−2	View file
drivers/base/power/main.c	modified	+35	−0	View file
drivers/base/power/power.h	modified	+3	−0	View file
drivers/cpuidle/Kconfig	modified	+0	−2	View file
drivers/cpuidle/cpuidle.c	modified	+3	−3	View file
drivers/cpuidle/governors/ladder.c	modified	+9	−0	View file
drivers/cpuidle/governors/menu.c	modified	+13	−10	View file
drivers/devfreq/devfreq-event.c	modified	+5	−11	View file
drivers/devfreq/devfreq.c	modified	+62	−16	View file
drivers/gpu/vga/vga_switcheroo.c	modified	+6	−5	View file
drivers/misc/mei/pci-me.c	modified	+3	−2	View file
drivers/misc/mei/pci-txe.c	modified	+3	−2	View file
drivers/platform/x86/thinkpad_acpi.c	modified	+1	−1	View file
drivers/usb/core/port.c	modified	+6	−0	View file
drivers/usb/core/usb.c	modified	+7	−1	View file
include/acpi/acbuffer.h	modified	+1	−1	View file
include/acpi/acconfig.h	modified	+1	−1	View file
include/acpi/acexcep.h	modified	+1	−1	View file
include/acpi/acnames.h	modified	+1	−1	View file
include/acpi/acoutput.h	modified	+1	−1	View file
include/acpi/acpi.h	modified	+1	−1	View file
include/acpi/acpiosxf.h	modified	+1	−1	View file
include/acpi/acpixf.h	modified	+2	−2	View file
include/acpi/acrestyp.h	modified	+1	−1	View file
include/acpi/actbl.h	modified	+1	−1	View file
include/acpi/actbl1.h	modified	+1	−1	View file
include/acpi/actbl2.h	modified	+1	−1	View file
include/acpi/actbl3.h	modified	+1	−1	View file
include/acpi/actypes.h	modified	+1	−1	View file
include/acpi/acuuid.h	modified	+1	−1	View file
include/acpi/platform/acenv.h	modified	+1	−1	View file
include/acpi/platform/acenvex.h	modified	+1	−1	View file
include/acpi/platform/acgcc.h	modified	+1	−1	View file
include/acpi/platform/aclinux.h	modified	+1	−1	View file
include/acpi/platform/aclinuxex.h	modified	+1	−1	View file
include/acpi/platform/acmsvcex.h	modified	+1	−1	View file
include/acpi/platform/acwinex.h	modified	+1	−1	View file
include/acpi/video.h	modified	+4	−0	View file
include/linux/devfreq.h	modified	+1	−1	View file
include/linux/device.h	modified	+2	−0	View file
include/linux/pm.h	modified	+1	−0	View file
include/linux/pm_domain.h	modified	+3	−0	View file
include/linux/tick.h	modified	+2	−0	View file
kernel/sched/idle.c	modified	+0	−6	View file
kernel/time/tick-sched.c	modified	+1	−1	View file
tools/power/acpi/common/cmfsize.c	modified	+1	−1	View file
tools/power/acpi/common/getopt.c	modified	+1	−1	View file
tools/power/acpi/os_specific/service_layers/oslibcfs.c	modified	+1	−1	View file
tools/power/acpi/os_specific/service_layers/oslinuxtbl.c	modified	+1	−1	View file
tools/power/acpi/os_specific/service_layers/osunixdir.c	modified	+1	−1	View file
tools/power/acpi/os_specific/service_layers/osunixmap.c	modified	+1	−1	View file
tools/power/acpi/os_specific/service_layers/osunixxf.c	modified	+1	−1	View file
tools/power/acpi/tools/acpidump/acpidump.h	modified	+1	−1	View file
tools/power/acpi/tools/acpidump/apdump.c	modified	+1	−1	View file
tools/power/acpi/tools/acpidump/apfiles.c	modified	+1	−1	View file
tools/power/acpi/tools/acpidump/apmain.c	modified	+1	−1	View file
tools/power/cpupower/utils/cpufreq-info.c	modified	+1	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index db68d7f..293874c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3453,8 +3453,21 @@ DEVICE FREQUENCY (DEVFREQ)
 M:	MyungJoo Ham <[email protected]>
 M:	Kyungmin Park <[email protected]>
 L:	[email protected]
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
 S:	Maintained
 F:	drivers/devfreq/
+F:	include/linux/devfreq.h
+F:	Documentation/devicetree/bindings/devfreq/
+
+DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
+M:	Chanwoo Choi <[email protected]>
+L:	[email protected]
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
+S:	Supported
+F:	drivers/devfreq/event/
+F:	drivers/devfreq/devfreq-event.c
+F:	include/linux/devfreq-event.h
+F:	Documentation/devicetree/bindings/devfreq/event/
 
 DEVICE NUMBER REGISTRY
 M:	Torben Mathiasen <[email protected]>

arch/arm/mach-omap2/omap_device.c

View file

diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index 3750ed1..0437537 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -32,6 +32,7 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 #include <linux/of.h>
 #include <linux/notifier.h>
@@ -168,7 +169,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
 			r->name = dev_name(&pdev->dev);
 	}
 
-	pdev->dev.pm_domain = &omap_device_pm_domain;
+	dev_pm_domain_set(&pdev->dev, &omap_device_pm_domain);
 
 	if (device_active) {
 		omap_device_enable(pdev);
@@ -180,7 +181,7 @@ odbfd_exit1:
 odbfd_exit:
 	/* if data/we are at fault.. load up a fail handler */
 	if (ret)
-		pdev->dev.pm_domain = &omap_device_fail_pm_domain;
+		dev_pm_domain_set(&pdev->dev, &omap_device_fail_pm_domain);
 
 	return ret;
 }
@@ -701,7 +702,7 @@ int omap_device_register(struct platform_device *pdev)
 {
 	pr_debug("omap_device: %s: registering\n", pdev->name);
 
-	pdev->dev.pm_domain = &omap_device_pm_domain;
+	dev_pm_domain_set(&pdev->dev, &omap_device_pm_domain);
 	return platform_device_add(pdev);
 }
 

drivers/acpi/acpi_lpss.c

View file

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 047281a..c570b1d 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -18,6 +18,7 @@
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/clk-lpss.h>
+#include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 #include <linux/delay.h>
 
@@ -875,13 +876,14 @@ static int acpi_lpss_platform_notify(struct notifier_block *nb,
 
 	switch (action) {
 	case BUS_NOTIFY_BIND_DRIVER:
-		pdev->dev.pm_domain = &acpi_lpss_pm_domain;
+		dev_pm_domain_set(&pdev->dev, &acpi_lpss_pm_domain);
 		break;
 	case BUS_NOTIFY_DRIVER_NOT_BOUND:
 	case BUS_NOTIFY_UNBOUND_DRIVER:
 		pdev->dev.pm_domain = NULL;
 		break;
 	case BUS_NOTIFY_ADD_DEVICE:
+		dev_pm_domain_set(&pdev->dev, &acpi_lpss_pm_domain);
 		if (pdata->dev_desc->flags & LPSS_LTR)
 			return sysfs_create_group(&pdev->dev.kobj,
 						  &lpss_attr_group);
@@ -889,6 +891,7 @@ static int acpi_lpss_platform_notify(struct notifier_block *nb,
 	case BUS_NOTIFY_DEL_DEVICE:
 		if (pdata->dev_desc->flags & LPSS_LTR)
 			sysfs_remove_group(&pdev->dev.kobj, &lpss_attr_group);
+		dev_pm_domain_set(&pdev->dev, NULL);
 		break;
 	default:
 		break;

drivers/acpi/acpi_video.c

View file

diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index 06a006f..a76f8be 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -90,10 +90,10 @@ module_param(device_id_scheme, bool, 0444);
 static bool only_lcd = false;
 module_param(only_lcd, bool, 0444);
 
-static DECLARE_COMPLETION(register_done);
-static DEFINE_MUTEX(register_done_mutex);
-static struct mutex video_list_lock;
-static struct list_head video_bus_head;
+static int register_count;
+static DEFINE_MUTEX(register_count_mutex);
+static DEFINE_MUTEX(video_list_lock);
+static LIST_HEAD(video_bus_head);
 static int acpi_video_bus_add(struct acpi_device *device);
 static int acpi_video_bus_remove(struct acpi_device *device);
 static void acpi_video_bus_notify(struct acpi_device *device, u32 event);
@@ -479,6 +479,15 @@ static struct dmi_system_id video_dmi_table[] = {
 	 * as brightness control does not work.
 	 */
 	{
+	 /* https://bugzilla.kernel.org/show_bug.cgi?id=21012 */
+	 .callback = video_disable_backlight_sysfs_if,
+	 .ident = "Toshiba Portege R700",
+	 .matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+		DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE R700"),
+		},
+	},
+	{
 	 /* https://bugs.freedesktop.org/show_bug.cgi?id=82634 */
 	 .callback = video_disable_backlight_sysfs_if,
 	 .ident = "Toshiba Portege R830",
@@ -487,6 +496,15 @@ static struct dmi_system_id video_dmi_table[] = {
 		DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE R830"),
 		},
 	},
+	{
+	 /* https://bugzilla.kernel.org/show_bug.cgi?id=21012 */
+	 .callback = video_disable_backlight_sysfs_if,
+	 .ident = "Toshiba Satellite R830",
+	 .matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+		DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE R830"),
+		},
+	},
 	/*
 	 * Some machine's _DOD IDs don't have bit 31(Device ID Scheme) set
 	 * but the IDs actually follow the Device ID Scheme.
@@ -2049,8 +2067,8 @@ int acpi_video_register(void)
 {
 	int ret = 0;
 
-	mutex_lock(&register_done_mutex);
-	if (completion_done(&register_done)) {
+	mutex_lock(&register_count_mutex);
+	if (register_count) {
 		/*
 		 * if the function of acpi_video_register is already called,
 		 * don't register the acpi_vide_bus again and return no error.
@@ -2058,9 +2076,6 @@ int acpi_video_register(void)
 		goto leave;
 	}
 
-	mutex_init(&video_list_lock);
-	INIT_LIST_HEAD(&video_bus_head);
-
 	dmi_check_system(video_dmi_table);
 
 	ret = acpi_bus_register_driver(&acpi_video_bus);
@@ -2071,22 +2086,22 @@ int acpi_video_register(void)
 	 * When the acpi_video_bus is loaded successfully, increase
 	 * the counter reference.
 	 */
-	complete(&register_done);
+	register_count = 1;
 
 leave:
-	mutex_unlock(&register_done_mutex);
+	mutex_unlock(&register_count_mutex);
 	return ret;
 }
 EXPORT_SYMBOL(acpi_video_register);
 
 void acpi_video_unregister(void)
 {
-	mutex_lock(&register_done_mutex);
-	if (completion_done(&register_done)) {
+	mutex_lock(&register_count_mutex);
+	if (register_count) {
 		acpi_bus_unregister_driver(&acpi_video_bus);
-		reinit_completion(&register_done);
+		register_count = 0;
 	}
-	mutex_unlock(&register_done_mutex);
+	mutex_unlock(&register_count_mutex);
 }
 EXPORT_SYMBOL(acpi_video_unregister);
 
@@ -2094,21 +2109,20 @@ void acpi_video_unregister_backlight(void)
 {
 	struct acpi_video_bus *video;
 
-	mutex_lock(&register_done_mutex);
-	if (completion_done(&register_done)) {
+	mutex_lock(&register_count_mutex);
+	if (register_count) {
 		mutex_lock(&video_list_lock);
 		list_for_each_entry(video, &video_bus_head, entry)
 			acpi_video_bus_unregister_backlight(video);
 		mutex_unlock(&video_list_lock);
 	}
-	mutex_unlock(&register_done_mutex);
+	mutex_unlock(&register_count_mutex);
 }
 
 bool acpi_video_handles_brightness_key_presses(void)
 {
 	bool have_video_busses;
 
-	wait_for_completion(&register_done);
 	mutex_lock(&video_list_lock);
 	have_video_busses = !list_empty(&video_bus_head);
 	mutex_unlock(&video_list_lock);

drivers/acpi/acpica/acapps.h

View file

diff --git a/drivers/acpi/acpica/acapps.h b/drivers/acpi/acpica/acapps.h
index 8b4ff40..ca2c060 100644
--- a/drivers/acpi/acpica/acapps.h
+++ b/drivers/acpi/acpica/acapps.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
 /* Common info for tool signons */
 
 #define ACPICA_NAME                 "Intel ACPI Component Architecture"
-#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2015 Intel Corporation"
+#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2016 Intel Corporation"
 
 #if ACPI_MACHINE_WIDTH == 64
 #define ACPI_WIDTH          "-64"

drivers/acpi/acpica/accommon.h

View file

diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h
index a8d8092..19d6ec8 100644
--- a/drivers/acpi/acpica/accommon.h
+++ b/drivers/acpi/acpica/accommon.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acdebug.h

View file

diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index ecb05f1..993af9e 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acdispat.h

View file

diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index 7094dc8..dcd48bf 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acevents.h

View file

diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index d18f184..010cf81 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acglobal.h

View file

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 73462ca..55c8197 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/achware.h

View file

diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index 196a552..27addcf 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acinterp.h

View file

diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index e9e936e..bae1a35 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/aclocal.h

View file

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 24928ec..e4977fa 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acmacros.h

View file

diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index bad5bca..411c18b 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acnamesp.h

View file

diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index d082e62..9684ed6 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acobject.h

View file

diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 2b154cf..094b042 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acopcode.h

View file

diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
index 324512d..ca4bda1 100644
--- a/drivers/acpi/acpica/acopcode.h
+++ b/drivers/acpi/acpica/acopcode.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acparser.h

View file

diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index 96d510a..7da639d 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acpredef.h

View file

diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index b9474b5..52f6bee 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acresrc.h

View file

diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index 6357efb..5dd58be 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acstruct.h

View file

diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index f9992dc..b3b386e 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/actables.h

View file

diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 591ea95..848ad3a 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acutils.h

View file

diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 9e84c05..e43ab6f 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/amlcode.h

View file

diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
index ab9f3f1..ceb4f73 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.h
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/amlresrc.h

View file

diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
index ee0cdd6..dee6c7e 100644
--- a/drivers/acpi/acpica/amlresrc.h
+++ b/drivers/acpi/acpica/amlresrc.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/dbcmds.c

View file

diff --git a/drivers/acpi/acpica/dbcmds.c b/drivers/acpi/acpica/dbcmds.c
index 328c35b..7ec62c4 100644
--- a/drivers/acpi/acpica/dbcmds.c
+++ b/drivers/acpi/acpica/dbcmds.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/dbconvert.c

View file

diff --git a/drivers/acpi/acpica/dbconvert.c b/drivers/acpi/acpica/dbconvert.c
index a71632c..9fee88f 100644
--- a/drivers/acpi/acpica/dbconvert.c
+++ b/drivers/acpi/acpica/dbconvert.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/dbdisply.c

View file

diff --git a/drivers/acpi/acpica/dbdisply.c b/drivers/acpi/acpica/dbdisply.c
index 1965b48..502bb58 100644
--- a/drivers/acpi/acpica/dbdisply.c
+++ b/drivers/acpi/acpica/dbdisply.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -599,12 +599,14 @@ void acpi_db_display_calling_tree(void)
 
 void acpi_db_display_object_type(char *object_arg)
 {
+	acpi_size arg;
 	acpi_handle handle;
 	struct acpi_device_info *info;
 	acpi_status status;
 	u32 i;
 
-	handle = ACPI_TO_POINTER(strtoul(object_arg, NULL, 16));
+	arg = strtoul(object_arg, NULL, 16);
+	handle = ACPI_TO_POINTER(arg);
 
 	status = acpi_get_object_info(handle, &info);
 	if (ACPI_FAILURE(status)) {

drivers/acpi/acpica/dbexec.c

View file

diff --git a/drivers/acpi/acpica/dbexec.c b/drivers/acpi/acpica/dbexec.c
index d713e2d..c814855 100644
--- a/drivers/acpi/acpica/dbexec.c
+++ b/drivers/acpi/acpica/dbexec.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/dbfileio.c

View file

diff --git a/drivers/acpi/acpica/dbfileio.c b/drivers/acpi/acpica/dbfileio.c
index 31f54d7..4832879 100644
--- a/drivers/acpi/acpica/dbfileio.c
+++ b/drivers/acpi/acpica/dbfileio.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/dbhistry.c

View file

diff --git a/drivers/acpi/acpica/dbhistry.c b/drivers/acpi/acpica/dbhistry.c
index 9c66a9e..46bd65d 100644
--- a/drivers/acpi/acpica/dbhistry.c
+++ b/drivers/acpi/acpica/dbhistry.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.

This diff is incomplete. Download the complete patch.