OSDN Git Service

Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Aug 2015 04:53:02 +0000 (14:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Aug 2015 04:53:03 +0000 (14:53 +1000)
1  2 
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/dra7.dtsi
drivers/acpi/acpi_pnp.c

Simple merge
Simple merge
Simple merge