Merge branch 'for-2.6.38/event-handling' into for-2.6.38/core

author Jens Axboe <[email protected]>

Thu, 13 Jan 2011 13:47:54 +0000 (14:47 +0100)

committer Jens Axboe <[email protected]>

Thu, 13 Jan 2011 13:47:54 +0000 (14:47 +0100)
author Jens Axboe <[email protected]>
Thu, 13 Jan 2011 13:47:54 +0000 (14:47 +0100)
committer Jens Axboe <[email protected]>
Thu, 13 Jan 2011 13:47:54 +0000 (14:47 +0100)
diff --cc block/genhd.c
Simple merge
diff --cc fs/partitions/check.c
Simple merge
diff --cc include/linux/blkdev.h
Simple merge
diff --cc include/linux/genhd.h
Simple merge
author	Jens Axboe <[email protected]>
	Thu, 13 Jan 2011 13:47:54 +0000 (14:47 +0100)
committer	Jens Axboe <[email protected]>
	Thu, 13 Jan 2011 13:47:54 +0000 (14:47 +0100)
		1	2
block/genhd.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/partitions/check.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/genhd.h	patch \|	diff1 \|	diff2 \|	blob \| history