Merge branch 'for-2.6.37/drivers' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.37/drivers' of git://git.kernel.dk/linux-2.6-block: (95 commits)
  cciss: fix PCI IDs for new Smart Array controllers
  drbd: add race-breaker to drbd_go_diskless
  drbd: use dynamic_dev_dbg to optionally log uuid changes
  dynamic_debug.h: Fix dynamic_dev_dbg() macro if CONFIG_DYNAMIC_DEBUG not set
  drbd: cleanup: change "<= 0" to "== 0"
  drbd: relax the grace period of the md_sync timer again
  drbd: add some more explicit drbd_md_sync
  drbd: drop wrong debug asserts, fix recently introduced race
  drbd: cleanup useless leftover warn/error printk's
  drbd: add explicit drbd_md_sync to drbd_resync_finished
  drbd: Do not log an ASSERT for P_OV_REQUEST packets while C_CONNECTED
  drbd: fix for possible deadlock on IO error during resync
  drbd: fix unlikely access after free and list corruption
  drbd: fix for spurious fullsync (uuids rotated too fast)
  drbd: allow for explicit resync-finished notifications
  drbd: preparation commit, using full state in receive_state()
  drbd: drbd_send_ack_dp must not rely on header information
  drbd: Fix regression in recv_bm_rle_bits (compressed bitmap)
  drbd: Fixed a stupid copy and paste error
  drbd: Allow larger values for c-fill-target.
  ...

Fix up trivial conflict in drivers/block/ataflop.c due to BKL removal

diff --cc drivers/block/amiflop.c
Simple merge

diff --cc drivers/block/ataflop.c
index 8c021bb,0f4eec4..4e4cc6c
--- 1/drivers/block/ataflop.c
--- 2/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@@ -79,9 -79,8 +79,9 @@@
  
  #undef DEBUG
  
- static struct request_queue *floppy_queue;
 +static DEFINE_MUTEX(ataflop_mutex);
  static struct request *fd_request;
+ static int fdc_queue;
  
  /* Disk types: DD, HD, ED */
  static struct atari_disk_type {

diff --cc drivers/block/cciss.c
Simple merge

diff --cc drivers/block/drbd/drbd_main.c
Simple merge

diff --cc drivers/block/drbd/drbd_receiver.c
Simple merge

diff --cc drivers/block/floppy.c
Simple merge

diff --cc drivers/block/loop.c
Simple merge

diff --cc include/linux/dynamic_debug.h
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge