summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-footbridge/isa-timer.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-04-04 01:33:32 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-04-04 01:33:32 +0200
commit95959e6a06720834fc80a210e37898341c63cb91 (patch)
tree832ed436b93bb7acd167d9ca8ecc4a45fc0aea22 /arch/arm/mach-footbridge/isa-timer.c
parentARM: 7958/1: amba: Let runtime PM callbacks be available for CONFIG_PM (diff)
parentARM: 8007/1: Remove extraneous kcmp syscall ignore (diff)
parentARM: Better virt_to_page() handling (diff)
parentARM: 7956/1: mmci: rename some extended flags (diff)
parentdmaengine: omap-dma: more consolidation of CCR register setup (diff)
parentARM: 8006/1: Remove redundant code (diff)
downloadlinux-95959e6a06720834fc80a210e37898341c63cb91.tar.xz
linux-95959e6a06720834fc80a210e37898341c63cb91.zip
Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unstable/sa11x0' into for-next