summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/max8998.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-17 00:02:30 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-17 00:02:30 +0100
commit97740400bc76b64781d01f8cdfbcf750582006ef (patch)
tree85900329fbce72011339ab2348dcf13dde2a64fd /drivers/mfd/max8998.c
parentMerge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/k... (diff)
parentPM / Hibernate: Drop the check of swap space size for compressed image (diff)
downloadlinux-97740400bc76b64781d01f8cdfbcf750582006ef.tar.xz
linux-97740400bc76b64781d01f8cdfbcf750582006ef.zip
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM / Hibernate: Drop the check of swap space size for compressed image PM / shmobile: fix A3SP suspend method PM / Domains: Skip governor functions for CONFIG_PM_RUNTIME unset PM / Domains: Fix build for CONFIG_PM_SLEEP unset PM: Make sysrq-o be available for CONFIG_PM unset
Diffstat (limited to 'drivers/mfd/max8998.c')
0 files changed, 0 insertions, 0 deletions