Makes the i2c device ids predictable. Still should check whether this
should be upstreamed at the board level and if so, if only the used i2c
interfaces should have aliases (and be subsequent?).

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

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

# Conflicts:
#	include/linux/cpumask.h

# Conflicts:
#	Documentation/translations/zh_CN/mm/free_page_reporting.rst
#	Documentation/translations/zh_CN/mm/frontswap.rst
#	Documentation/translations/zh_CN/mm/page_frags.rst
#	Documentation/translations/zh_CN/mm/page_migration.rst
#	Documentation/translations/zh_CN/mm/vmalloced-kernel-stacks.rst
#	Documentation/translations/zh_CN/mm/zsmalloc.rst
#	include/linux/pagevec.h

# Conflicts:
#	kernel/cfi.c

# Conflicts:
#	fs/buffer.c

# Conflicts:
#	Makefile
#	arch/x86/Makefile
#	include/uapi/linux/android/binder.h

# Conflicts:
#	arch/arm64/kernel/kaslr.c
#	arch/powerpc/Kconfig
#	arch/s390/include/asm/archrandom.h

# Conflicts:
#	arch/arm/configs/milbeaut_m10v_defconfig

Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git

# Conflicts:
#	MAINTAINERS

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git