summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-01 11:53:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-01 11:53:54 -0800
commit3b120ab76225592e9c267086fa4dfa3ce5a075fe (patch)
treebb54ccf104aa4ed0e23ec585834016051b935a36 /fs/ocfs2
parentb930c26416c4ea6855726fd977145ccea9afbdda (diff)
parent4cbd6b167f9ed756ced970e0a95538f60ae3b9ab (diff)
downloadop-kernel-dev-3b120ab76225592e9c267086fa4dfa3ce5a075fe.zip
op-kernel-dev-3b120ab76225592e9c267086fa4dfa3ce5a075fe.tar.gz
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: 7182/1: ARM cpu topology: fix warning ARM: 7181/1: Restrict kprobes probing SWP instructions to ARMv5 and below ARM: 7180/1: Change kprobes testcase with unpredictable STRD instruction ARM: 7177/1: GIC: avoid skipping non-existent PPIs in irq_start calculation ARM: 7176/1: cpu_pm: register GIC PM notifier only once ARM: 7175/1: add subname parameter to mfp_set_groupg callers ARM: 7174/1: Fix build error in kprobes test code on Thumb2 kernels ARM: 7172/1: dma: Drop GFP_COMP for DMA memory allocations ARM: 7171/1: unwind: add unwind directives to bitops assembly macros ARM: 7170/2: fix compilation breakage in entry-armv.S ARM: 7168/1: use cache type functions for arch_get_unmapped_area ARM: perf: check that we have a platform device when reserving PMU ARM: 7166/1: Use PMD_SHIFT instead of PGDIR_SHIFT in dma-consistent.c ARM: 7165/2: PL330: Fix typo in _prepare_ccr() ARM: 7163/2: PL330: Only register usable channels ARM: 7162/1: errata: tidy up Kconfig options for PL310 errata workarounds ARM: 7161/1: errata: no automatic store buffer drain ARM: perf: initialise used_mask for fake PMU during validation ARM: PMU: remove pmu_init declaration ARM: PMU: re-export release_pmu symbol to modules
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud