Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile		2011-03-20 18:14:55 -07: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	PM / Core: Introduce struct syscore_ops for core subsystems PM	2011-03-15 00:43:46 +01:00
Kconfig	PM: Simplify kernel/power/Kconfig	2011-03-15 00:43:17 +01:00
main.c	PM: Drop pm_flags that is not necessary	2011-03-15 00:43:16 +01:00
Makefile	kernel: change to new flag variable	2011-03-17 14:02:54 +01: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	workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'	2011-02-16 17:48:59 +01:00
snapshot.c	PM / Hibernate: Reduce autotuned default image size	2011-03-15 00:45:46 +01:00
suspend_test.c	PM: Make warning in suspend_test_finish() less likely to happen	2009-10-22 08:23:45 +09:00
suspend.c	PM / Core: Introduce struct syscore_ops for core subsystems PM	2011-03-15 00:43:46 +01:00
swap.c	Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block	2011-01-13 10:45:01 -08:00
user.c	PM / Hibernate: Fix PM_POST_* notification with user-space suspend	2010-12-16 17:08:43 +01:00