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
..
boot	arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS	2011-11-15 17:13:15 +08:00
configs	unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig)	2011-06-09 16:24:42 +08:00
include	freezer: remove now unused TIF_FREEZE	2011-11-21 12:32:25 -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	unicore32: fix build error for find bitops	2011-11-15 17:13:14 +08:00
mm	memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users	2011-12-08 10:22:08 -08:00
.gitignore	unicore32 core architecture: build infrastructure	2011-03-17 09:19:05 +08:00
Kconfig	unicore32: Fix typo 'PUV3_I2C'	2011-11-16 10:48:21 +08:00
Kconfig.debug	unicore32: drop unused Kconfig symbols	2011-11-15 17:13:18 +08:00
Makefile	unicore32: using generic-y format for one line asm-generic files	2011-06-09 16:29:52 +08:00