tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge commit 'gcl/merge' into merge

Benjamin Herrenschmidt d301a9f3 ed75d863

+2 -2
unified split
+1 -1
arch/powerpc/configs/40x/virtex_defconfig
··· 686 CONFIG_SERIAL_CORE=y 687 CONFIG_SERIAL_CORE_CONSOLE=y 688 # CONFIG_SERIAL_JSM is not set 689 - # CONFIG_SERIAL_OF_PLATFORM is not set 690 # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set 691 CONFIG_UNIX98_PTYS=y 692 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
··· 686 CONFIG_SERIAL_CORE=y 687 CONFIG_SERIAL_CORE_CONSOLE=y 688 # CONFIG_SERIAL_JSM is not set 689 + CONFIG_SERIAL_OF_PLATFORM=y 690 # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set 691 CONFIG_UNIX98_PTYS=y 692 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+1 -1
arch/powerpc/configs/44x/virtex5_defconfig
··· 691 CONFIG_SERIAL_CORE=y 692 CONFIG_SERIAL_CORE_CONSOLE=y 693 # CONFIG_SERIAL_JSM is not set 694 - # CONFIG_SERIAL_OF_PLATFORM is not set 695 # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set 696 CONFIG_UNIX98_PTYS=y 697 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
··· 691 CONFIG_SERIAL_CORE=y 692 CONFIG_SERIAL_CORE_CONSOLE=y 693 # CONFIG_SERIAL_JSM is not set 694 + CONFIG_SERIAL_OF_PLATFORM=y 695 # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set 696 CONFIG_UNIX98_PTYS=y 697 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set