linux-next: manual merge of the akpm-current tree with the driver-core tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got conflicts in: mm/failslab.c mm/page_alloc.c between commit: 621a5f7ad9cd ("debugfs: Pass bool pointer to debugfs_create_bool()") from the driver-core tree and commit: 67c145d9ff18 ("mm, page_alloc: rename __GFP_WAIT to _

linux-next: manual merge of the akpm-current tree with the driver-core tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in drivers/rtc/rtc-omap.c between commit 0929ae376ef3 ("rtc: drop owner assignment from platform_drivers") from the driver-core tree and commit 700abe25a31a ("rtc: omap: remove DRIVER_NAME macro") from the akpm-current tre