summaryrefslogtreecommitdiffstats
path: root/drivers/uio
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-14 15:59:23 +0200
committerArnd Bergmann <arnd@arndb.de>2016-07-14 17:38:54 +0200
commitcda1c2bdf6df90c12363877fda594a0a1b7ac74a (patch)
treeee2abe9490b4b67bc5d61310a8ca3a751320e6ec /drivers/uio
parentMerge branch 'reset/for-4.8-2' into next/dt (diff)
parentspi: st-ssc4: Remove 'no clocking' hack (diff)
downloadlinux-cda1c2bdf6df90c12363877fda594a0a1b7ac74a.tar.xz
linux-cda1c2bdf6df90c12363877fda594a0a1b7ac74a.zip
Merge tag 'sti-late-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/late
Merge "STi late updates for v4.8" from Patrice Chotard: - Add STi DT critical clocks declaration - Remove SPI hack wich has dependecy with critical clocks These 2 STi DT patches and SPI hack MUST be applied after patches contained into Stephen Boyd's branch clk-next/clk-st-critical. This to ensure not to break SPI. * tag 'sti-late-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti: spi: st-ssc4: Remove 'no clocking' hack ARM: sti: stih410-clocks: Identify critical clocks ARM: sti: stih407-family: Supply defines for CLOCKGEN A0 clk: st: clkgen-pll: Detect critical clocks clk: st: clkgen-fsyn: Detect critical clocks clk: st: clk-flexgen: Detect critical clocks
Diffstat (limited to 'drivers/uio')
0 files changed, 0 insertions, 0 deletions