android_kernel_xiaomi_sm8350/drivers/pnp/pnpbios
Benjamin Herrenschmidt 6dc6472581 Merge commit 'origin'
Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h
2008-10-15 11:31:54 +11:00
..
bioscalls.c
core.c Merge commit 'origin' 2008-10-15 11:31:54 +11:00
Kconfig
Makefile
pnpbios.h
proc.c
rsparser.c