Merge branch 'for-2.6.38/event-handling' into for-2.6.38/core
Jens Axboe [Thu, 13 Jan 2011 13:47:54 +0000 (14:47 +0100)]
1  2 
block/genhd.c
fs/partitions/check.c
include/linux/blkdev.h
include/linux/genhd.h

diff --cc block/genhd.c
Simple merge
Simple merge
Simple merge
Simple merge