summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-13 09:28:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-13 09:28:23 -0800
commit442ee5a942834431ccf0b412e3cf7bb9ae97ff4e (patch)
tree77a9f87265c97e0df5449fe6888df393f028aea2 /fs
parent13c07b0286d340275f2d97adf085cecda37ede37 (diff)
parent9811ccdfa94b4773c8030569bd8ec75eafa485ac (diff)
Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: ARM: 7204/1: arch/arm/kernel/setup.c: initialize arm_dma_zone_size earlier ARM: 7185/1: perf: don't assign platform_device on unsupported CPUs ARM: 7187/1: fix unwinding for XIP kernels ARM: 7186/1: fix Kconfig issue with PHYS_OFFSET and !MMU
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions