diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-17 20:27:37 +0300 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-17 20:28:05 +0300 |
commit | b7e56edba4b02f2079042c326a8cd72a44635817 (patch) | |
tree | b5042002e9747cd8fb1278d61f86d8b92a74c018 /arch/m68k/include/asm/m5249sim.h | |
parent | 13ca0fcaa33f6b1984c4111b6ec5df42689fea6f (diff) | |
parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
download | linux-b7e56edba4b02f2079042c326a8cd72a44635817.tar.xz |
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/m68k/include/asm/m5249sim.h')
0 files changed, 0 insertions, 0 deletions