diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-21 19:08:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-21 19:08:39 +0200 |
| commit | a6b881a5b8d4fa2135e55a74be6d6b1e17e445dd (patch) | |
| tree | 2f69d3d20df6252daf69daf61fb3ea76f0edac0c /drivers/clocksource/cs5535-clockevt.c | |
| parent | Merge tag 'pinctrl-fixes-v3.6-rc3' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | m68k: select CONFIG_GENERIC_ATOMIC64 for all m68k CPU types (diff) | |
| download | linux-a6b881a5b8d4fa2135e55a74be6d6b1e17e445dd.tar.xz linux-a6b881a5b8d4fa2135e55a74be6d6b1e17e445dd.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu arch fixes from Greg Ungerer:
"This contains 2 fixes. One fixes compilation of ColdFire clk code,
the other makes sure we use the generic atomic64 support on all m68k
targets."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: select CONFIG_GENERIC_ATOMIC64 for all m68k CPU types
m68knommu: select CONFIG_HAVE_CLK for ColdFire CPU types
Diffstat (limited to 'drivers/clocksource/cs5535-clockevt.c')
0 files changed, 0 insertions, 0 deletions