Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[~andy/linux] / include / uapi / linux / irqnr.h

/*
 * There isn't anything here anymore, but the file must not be empty or patch
 * will delete it.
 */