summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-15 17:19:05 +0100
committerArnd Bergmann <arnd@arndb.de>2012-11-15 17:19:05 +0100
commitb770ea523d95837e968d46c7fe09a3f5edd9bb27 (patch)
treee29f0098f770f707844a90c0d94563cec4fd086b /fs/btrfs/inode.c
parentMerge branch 'omap/headers4' into next/drivers (diff)
parentMerge tag 'gpmc-generic-timing' of git://gitorious.org/x0148406-public/linux-... (diff)
downloadlinux-b770ea523d95837e968d46c7fe09a3f5edd9bb27.tar.xz
linux-b770ea523d95837e968d46c7fe09a3f5edd9bb27.zip
Merge tag 'omap-for-v3.8/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
From Tony Lindgren <tony@atomide.com>: omap GPMC (General Purpose Memory Controller) updates via Afzal Mohammed <afzal@ti.com>: These changes provide a generic gpmc timing calculation method, migrates existing peripherals that makes use of custom gpmc timing calculation method to use the new generic one. The generic timing routine has been tested with onenand, smsc911x, and tusb6010 devices connected to GPMC in addition to simulating other devices support in the mainline kernel. * tag 'omap-for-v3.8/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: tusb6010: generic timing calculation ARM: OMAP2+: smc91x: generic timing calculation ARM: OMAP2+: onenand: generic timing calculation ARM: OMAP2+: gpmc: generic timing calculation ARM: OMAP2+: gpmc: handle additional timings ARM: OMAP2+: nand: remove redundant rounding Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/btrfs/inode.c')
0 files changed, 0 insertions, 0 deletions