Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
block_io.c	block: unify flags for struct bio and struct request	2010-08-07 18:20:39 +02:00
console.c	vt: introduce and use vt_kmsg_redirect() function	2009-12-15 08:53:28 -08:00
hibernate.c	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
Kconfig	PM / OPP: Hide OPP configuration when SoCs do not provide an implementation	2010-11-11 01:51:26 +01:00
main.c	PM: Add sysfs attr for rechecking dev hash from PM trace	2010-10-17 01:57:50 +02:00
Makefile	suspend: Move NVS save/restore code to generic suspend functionality	2010-06-10 11:02:34 -04:00
nvs.c	suspend: Move NVS save/restore code to generic suspend functionality	2010-06-10 11:02:34 -04:00
power.h	PM / Hibernate: Make default image size depend on total RAM size	2010-10-17 01:57:43 +02:00
poweroff.c	Input: sysrq - drop tty argument from sysrq ops handlers	2010-08-19 22:07:06 -07:00
process.c	PM: Allow wakeup events to abort freezing of tasks	2010-10-17 01:57:49 +02:00
snapshot.c	use clear_page()/copy_page() in favor of memset()/memcpy() on whole pages	2010-10-26 16:52:13 -07:00
suspend.c	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
suspend_test.c	PM: Make warning in suspend_test_finish() less likely to happen	2009-10-22 08:23:45 +09:00
swap.c	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
user.c	PM / Hibernate: Fix PM_POST_* notification with user-space suspend	2010-12-16 17:08:43 +01:00