diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 13:20:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 13:20:37 +0100 |
| commit | 9e64b2a421db0f825ae2c07ed004c785303dc70e (patch) | |
| tree | 3dc88c504509c8db16784c0430ec8ce6df2cf9c1 /arch/x86/kernel/ioport.c | |
| parent | 0924a4254e5d69aee5441f436ec2febab2441c99 (diff) | |
| parent | fc89a576006794f06f7b2919131f6e3e07af5b92 (diff) | |
Merge tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt
Pull "Keystone dts updates for 3.19" from Santosh Shilimkar:
- PCIE controller related updates
- 1GBe phy related upates
* tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: dts: keystone-k2e: add DT bindings for PCI controller for port 1
ARM: dts: keystone: add DT bindings for PCI controller for port 0
ARM: dts: k2l-evm: add 1g ethernet phys nodes
ARM: dts: k2e-evm: add 1g ethernet phys nodes
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/x86/kernel/ioport.c')
0 files changed, 0 insertions, 0 deletions