aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/atomic.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-22 18:24:26 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-22 18:41:48 +0100
commit695884fb8acd9857e0e7120ccb2150e30f4b8fef (patch)
tree49aa424c1a021ce432e9fa5ea29d37a23e4e30cc /arch/s390/include/asm/atomic.h
parent5df91509d324d44cfb11e55d9cb02fe18b53b045 (diff)
parent04bea68b2f0eeebb089ecc67b618795925268b4a (diff)
downloadkernel_samsung_tuna-695884fb8acd9857e0e7120ccb2150e30f4b8fef.zip
kernel_samsung_tuna-695884fb8acd9857e0e7120ccb2150e30f4b8fef.tar.gz
kernel_samsung_tuna-695884fb8acd9857e0e7120ccb2150e30f4b8fef.tar.bz2
Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform
Reason: x86 devicetree support for ce4100 depends on those device tree changes scheduled for .39. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/s390/include/asm/atomic.h')
0 files changed, 0 insertions, 0 deletions