Merge branch 'akpm/master'
memblock-make-memblock_set_node-support-different-memblock_type-fix

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Revert "rtc: add hym8563 rtc-driver"

This reverts commit 34ef6d7fe467b8b0a65371e7da0a4be06f3e9581.
Add linux-next specific files for 20131217

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>