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

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