diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-23 12:04:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-23 12:04:58 +1100 |
| commit | abb70d5d3cbbd8e720d142229f9884916a563563 (patch) | |
| tree | b4f713991c413be9709af40059087e3ed3b85738 /arch/blackfin/include/asm/atomic.h | |
| parent | 222133bcbaa70d48f494b8d66a351692984431b0 (diff) | |
| parent | 2b7dc9360261d26e770badf10d809c16cf6224b6 (diff) | |
Merge remote-tracking branch 'ux500-core/ux500-core'
Conflicts:
arch/arm/configs/u8500_defconfig
Diffstat (limited to 'arch/blackfin/include/asm/atomic.h')
0 files changed, 0 insertions, 0 deletions