Merge branch 'generic-dispatch' of git://brick.kernel.dk/data/git/linux-2.6-block

diff --cc drivers/block/as-iosched.c
Simple merge

diff --cc drivers/block/cfq-iosched.c
Simple merge

diff --cc drivers/block/deadline-iosched.c
Simple merge

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

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

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

diff --cc include/linux/elevator.h
index ed93125c1db5b6bc0f0e72f6baba89ddb7c501f8,f9b5ec38121aeb0e77154a84d874e57f029e4e04..a74c27e460bae3d0baf94b0c3a89d5a6c55352ac
--- 1/include/linux/elevator.h
--- 2/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@@ -18,8 -16,9 +16,9 @@@ typedef struct request *(elevator_reque
  typedef void (elevator_completed_req_fn) (request_queue_t *, struct request *);
  typedef int (elevator_may_queue_fn) (request_queue_t *, int, struct bio *);
  
 -typedef int (elevator_set_req_fn) (request_queue_t *, struct request *, struct bio *, int);
 +typedef int (elevator_set_req_fn) (request_queue_t *, struct request *, struct bio *, gfp_t);
  typedef void (elevator_put_req_fn) (request_queue_t *, struct request *);
+ typedef void (elevator_activate_req_fn) (request_queue_t *, struct request *);
  typedef void (elevator_deactivate_req_fn) (request_queue_t *, struct request *);
  
  typedef int (elevator_init_fn) (request_queue_t *, elevator_t *);