summaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-20 19:24:17 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-20 19:24:17 +0400
commit0c5445015c8e37d4f79c16fa51be398c4cb0e46c (patch)
treed5043bad8b42de2872d18f4a5c8ff63492718d88 /drivers/mtd
parent1ffab3d4139533eff6e27b7568825307e575faa6 (diff)
parent77c8006d8df4d5bafeb1d15eafa0886ae96e9b17 (diff)
downloadlinux-0c5445015c8e37d4f79c16fa51be398c4cb0e46c.tar.xz
Merge tag 'cris-for-linus-3.8' of git://jni.nu/cris
Pull CRIS changes from Jesper Nilsson. ... mainly the UAPI disintegration. * tag 'cris-for-linus-3.8' of git://jni.nu/cris: UAPI: Fix up empty files in arch/cris/ CRIS: locking: fix the return value of arch_read_trylock() CRIS: use kbuild.h instead of defining macros in asm-offset.c UAPI: (Scripted) Disintegrate arch/cris/include/asm UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
Diffstat (limited to 'drivers/mtd')
0 files changed, 0 insertions, 0 deletions