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
..
drivers	Merge branch 'for-linus' of git://github.com/richardweinberger/linux	2011-11-02 09:45:39 -07:00
include	freezer: remove now unused TIF_FREEZE	2011-11-21 12:32:25 -08:00
kernel	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-06 13:57:44 -08:00
os-Linux	um: unify ptrace_user.h	2011-11-02 14:15:27 +01:00
scripts	um: take arch/um/sys-x86 to arch/x86/um	2011-11-02 14:15:05 +01:00
sys-ia64	uml: remove useless comments	2009-04-01 08:59:17 -07:00
sys-ppc	um: change to new flag variables	2011-03-17 14:02:57 +01:00
.gitignore	um: tell git to ignore generated files	2010-03-06 11:26:28 -08:00
defconfig	time: Cleanup old CONFIG_GENERIC_TIME references that snuck in	2011-10-04 13:07:47 -07:00
Kconfig.char	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Kconfig.common	genirq: Remove the now obsolete config options and select statements	2011-03-30 14:13:23 +02:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Kconfig.net	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig.rest	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
Kconfig.um	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Makefile	um: take arch/um/sys-x86 to arch/x86/um	2011-11-02 14:15:05 +01:00
Makefile-ia64
Makefile-os-Linux	x86, um: get rid of arch/um/os symlink	2008-10-22 22:55:22 -07:00
Makefile-ppc
Makefile-skas	[PATCH] uml makefiles sanitized	2005-09-29 08:46:26 -07:00