diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-02 07:21:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-02 07:21:25 -0700 |
| commit | f6d3125fa3c2f55ddf7cf69365c41089de6cfae6 (patch) | |
| tree | ff2bcb135ebf090d7b383d55123b621f4590632c /arch/arm/boot/dts/omap3-beagle.dts | |
| parent | 2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb (diff) | |
| parent | 36f8dafe52b0d0726edd5102900e37192f1d3c65 (diff) | |
| download | op-kernel-dev-f6d3125fa3c2f55ddf7cf69365c41089de6cfae6.zip op-kernel-dev-f6d3125fa3c2f55ddf7cf69365c41089de6cfae6.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/dsa/slave.c
net/dsa/slave.c simply had overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/omap3-beagle.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3-beagle.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index a547411..67659a0 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts @@ -202,7 +202,7 @@ tfp410_pins: pinmux_tfp410_pins { pinctrl-single,pins = < - 0x194 (PIN_OUTPUT | MUX_MODE4) /* hdq_sio.gpio_170 */ + 0x196 (PIN_OUTPUT | MUX_MODE4) /* hdq_sio.gpio_170 */ >; }; |
