These two files were intimately connected, so just merge them.
Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>