diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-18 14:39:18 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-18 14:39:18 -0700 |
| commit | 054388947ca926260248774819858ee2dbbc735d (patch) | |
| tree | 2c3cd263160d21232355fbb9396ed395d84c183a /drivers/gpio/gpio-max7300.c | |
| parent | 81cca645b67299b606b57a49f54596827ef8b32a (diff) | |
| parent | e0d69e119fc6bf7cc3c9f791478108c1b925bb2e (diff) | |
| download | talos-obmc-linux-054388947ca926260248774819858ee2dbbc735d.tar.gz talos-obmc-linux-054388947ca926260248774819858ee2dbbc735d.zip | |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
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>
Diffstat (limited to 'drivers/gpio/gpio-max7300.c')
0 files changed, 0 insertions, 0 deletions
