summaryrefslogtreecommitdiffstats
path: root/fs/timerfd.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-26 16:55:36 +0200
committerArnd Bergmann <arnd@arndb.de>2013-06-26 16:56:24 +0200
commit9686bb66a4c50e43ffee903a9fc62237ee2de1e6 (patch)
tree89fa21b387f64e6027c0bddd7783899813dca7f6 /fs/timerfd.c
parentMerge tag 'dt-3.11-6' of git://git.infradead.org/users/jcooper/linux into nex... (diff)
parentARM: at91: dt: rm9200ek: add spi support (diff)
downloadlinux-9686bb66a4c50e43ffee903a9fc62237ee2de1e6.tar.xz
linux-9686bb66a4c50e43ffee903a9fc62237ee2de1e6.zip
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
From Nicolas Ferre: - more SPI DT activation for rm9200 - SPI DMA for at91sam9n12/sama5d3 And one little fix for SPI compatibility string * tag 'at91-dt' of git://github.com/at91linux/linux-at91: ARM: at91: dt: rm9200ek: add spi support ARM: at91: dt: rm9200: add spi support ARM: at91/DT: at91sam9n12: add SPI DMA client infos ARM: at91/DT: sama5d3: add SPI DMA client infos ARM: at91/DT: fix SPI compatibility string Conflicts: arch/arm/boot/dts/sama5d3.dtsi Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions