Merge

diff --cc drivers/ide/ide-disk.c
index 4f4dae4d90ea9937901cc3fc8684539e4b030ff7,d6cba782dc2c410051cdcaa2957c8f99e8d9f856..30ee192afb9cc2d559cd27ffd0b379b89a72a96a
--- 1/drivers/ide/ide-disk.c
--- 2/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@@ -27,8 -27,6 +27,7 @@@
  #include <linux/slab.h>
  #include <linux/delay.h>
  #include <linux/ide.h>
- #include <linux/suspend.h>
 +#include <linux/buffer_head.h>                /* for invalidate_bdev() */
  
  #include <asm/byteorder.h>
  #include <asm/irq.h>

diff --cc fs/reiserfs/journal.c
Simple merge

diff --cc kernel/suspend.c
Simple merge