projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
81cca64
e0d69e1
)
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
author
Olof Johansson
<olof@lixom.net>
Fri, 18 Jul 2014 21:39:18 +0000
(14:39 -0700)
committer
Olof Johansson
<olof@lixom.net>
Fri, 18 Jul 2014 21:39:18 +0000
(14:39 -0700)
Merge "at91: fixes for 3.16 #2" from Nicolas Ferre:
Second AT91 fixes series for 3.16
- fix clock definitions after the move to CCF for:
* at91sam9n12 (ohci)
* at91sam9x5 (ohci, pwm)
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91/dt: add missing clocks property to pwm node in sam9x5.dtsi
ARM: at91/dt: fix usb0 clocks definition in sam9n12 dtsi
ARM: at91: at91sam9x5: correct typo error for ohci clock
Signed-off-by: Olof Johansson <olof@lixom.net>
1
2
arch/arm/boot/dts/at91sam9x5.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/boot/dts/at91sam9x5.dtsi
Simple merge