diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-21 10:08:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-21 10:08:39 -0700 |
| commit | a6b881a5b8d4fa2135e55a74be6d6b1e17e445dd (patch) | |
| tree | 2f69d3d20df6252daf69daf61fb3ea76f0edac0c /include/linux/if_link.h | |
| parent | 8f6c1ca9be29b49b03a94c8db33998093ea809f6 (diff) | |
| parent | 42b1b94635a467407841c89e91d9209c55f6bc61 (diff) | |
| download | blackbird-op-linux-a6b881a5b8d4fa2135e55a74be6d6b1e17e445dd.tar.gz blackbird-op-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 'include/linux/if_link.h')
0 files changed, 0 insertions, 0 deletions
