]> git.karo-electronics.de Git - mv-sheeva.git/commit - include/xen/interface/features.h
Merge branch 'for-2.6.37/drivers' into for-linus
authorJens Axboe <jaxboe@fusionio.com>
Wed, 10 Nov 2010 13:51:27 +0000 (14:51 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Wed, 10 Nov 2010 13:51:27 +0000 (14:51 +0100)
commit00e375e7e962f938f6b3c93e4cd097a5e26cc788
tree9aacf8566c688273af830fc4e50186810068b028
parentf85acd81aa623e3dcf268c90e5cd8ecf36830984
parent4205df34003eec4371020872cdfa228ffae5bd6a
Merge branch 'for-2.6.37/drivers' into for-linus

Conflicts:
drivers/block/cciss.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
drivers/block/cciss.c
drivers/block/drbd/drbd_int.h
drivers/block/drbd/drbd_main.c