diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-01 04:21:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-01 04:21:03 +0100 |
| commit | c00552ebafddfe6abb397d957004f165e010abd2 (patch) | |
| tree | b397d6773b545755ffdae7566f8b96b08ee54ebb /arch/arm/boot/dts/sama5d33.dtsi | |
| parent | Merge tag 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/... (diff) | |
| parent | Linux 3.18-rc7 (diff) | |
| download | linux-c00552ebafddfe6abb397d957004f165e010abd2.tar.xz linux-c00552ebafddfe6abb397d957004f165e010abd2.zip | |
Merge 3.18-rc7 into usb-next
We need the xhci fixes here and this resolves a merge issue with
drivers/usb/dwc3/ep0.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/sama5d33.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sama5d33.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sama5d33.dtsi b/arch/arm/boot/dts/sama5d33.dtsi index 39f832253caf..4b4434aca351 100644 --- a/arch/arm/boot/dts/sama5d33.dtsi +++ b/arch/arm/boot/dts/sama5d33.dtsi @@ -10,5 +10,5 @@ #include "sama5d3_gmac.dtsi" / { - compatible = "atmel,samad33", "atmel,sama5d3", "atmel,sama5"; + compatible = "atmel,sama5d33", "atmel,sama5d3", "atmel,sama5"; }; |