diff options
| author | Olof Johansson <olof@lixom.net> | 2014-09-23 21:58:35 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-23 21:58:50 -0700 |
| commit | 4693c723f713a11c9ef3cecdea295e824bf57901 (patch) | |
| tree | 3facc645104fedd66ce93d5042f645982d1466d5 /fs/ocfs2/cluster/tcp.c | |
| parent | 2f83c3da277e08877280fa2c0fc21aad9aca6735 (diff) | |
| parent | b052ff30cd450c91a32e8e928979bca021462996 (diff) | |
| download | blackbird-op-linux-4693c723f713a11c9ef3cecdea295e824bf57901.tar.gz blackbird-op-linux-4693c723f713a11c9ef3cecdea295e824bf57901.zip | |
Merge tag 'at91-drivers2' of git://github.com/at91linux/linux-at91 into next/drivers
Merge " Second drivers series for AT91/3.18" from Nicolas Ferre:
- move of the PIT (basic timer) from mach-at91 to its proper location:
drivers/clocksource
- big cleanup of this driver along the way
* tag 'at91-drivers2' of git://github.com/at91linux/linux-at91:
ARM: at91: PIT: Move the driver to drivers/clocksource
ARM: at91: Give the PIT irq as an argument of at91sam926x_pit_init
ARM: at91: Convert the boards to the init_time callback
ARM: at91: soc: Add init_time callback
ARM: at91: PIT: (Almost) remove the global variables
ARM: at91: PIT: use request_irq instead of setup_irq
ARM: at91: PIT: Use pr_fmt
ARM: at91: PIT: Use consistent exit path in probe
ARM: at91: dt: Remove init_time definitions
ARM: at91: PIT: Rework probe functions
ARM: at91: PIT: Use of_have_populated_dt instead of CONFIG_OF
ARM: at91: PIT: Use DIV_ROUND_CLOSEST to compute the cycles
ARM: at91: generic.h: Add include safe guards
ARM: at91: PIT: Follow the general coding rules
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/ocfs2/cluster/tcp.c')
0 files changed, 0 insertions, 0 deletions
