Linus Torvalds eb59c505f8 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: (76 commits) PM / Hibernate: Implement compat_ioctl for /dev/snapshot PM / Freezer: fix return value of freezable_schedule_timeout_killable() PM / shmobile: Allow the A4R domain to be turned off at run time PM / input / touchscreen: Make st1232 use device PM QoS constraints PM / QoS: Introduce dev_pm_qos_add_ancestor_request() PM / shmobile: Remove the stay_on flag from SH7372's PM domains PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resume PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode PM: Drop generic_subsys_pm_ops PM / Sleep: Remove forward-only callbacks from AMBA bus type PM / Sleep: Remove forward-only callbacks from platform bus type PM: Run the driver callback directly if the subsystem one is not there PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412. PM / Sleep: Merge internal functions in generic_ops.c PM / Sleep: Simplify generic system suspend callbacks PM / Hibernate: Remove deprecated hibernation snapshot ioctls PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled() ARM: S3C64XX: Implement basic power domain support PM / shmobile: Use common always on power domain governor ... Fix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused XBT_FORCE_SLEEP bit		2012-01-08 13:10:57 -08:00
..
boards	sh: fix build warning in board-sh7757lcr	2011-11-18 16:45:50 +09:00
boot	sh: kexec: Add PHYSICAL_START	2011-10-28 15:03:43 +09:00
cchips	sh: Convert to new function names	2011-03-29 14:48:13 +02:00
configs	sh: fix compile error using sh7757lcr_defconfig	2011-06-21 17:40:42 +09:00
drivers	sh: dma - convert sysdev_class to a regular subsystem	2011-12-21 15:09:52 -08:00
include	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2012-01-08 13:10:57 -08:00
kernel	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
lib	sh: Ensure ST40-300 BogoMIPS value is consistent	2011-02-15 16:24:05 +09:00
lib64	Fix common misspellings	2011-03-31 11:26:23 -03:00
math-emu	perf: Remove the nmi parameter from the swevent and overflow interface	2011-07-01 11:06:35 +02:00
mm	memblock: Kill early_node_map[]	2011-12-08 10:22:09 -08:00
oprofile	oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue	2011-12-23 11:58:34 +01:00
tools	sh: Add support for AP-SH4AD-0A board.	2011-01-13 18:36:21 +09:00
Kconfig	SuperH: Use HAVE_MEMBLOCK_NODE_MAP	2011-12-08 10:22:08 -08:00
Kconfig.cpu	sh: Turn on speculative return for SH7785 and SH7786	2010-02-18 18:54:18 +09:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	sh: Add default uImage rule for sh7757lcr	2011-11-01 16:01:12 +09:00