summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/ppc970-pmu.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-13 03:37:04 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-13 03:37:04 +0200
commitd6cf853d4d73c268fc8920ac4e812ee26a12847c (patch)
treec909145638eb5c4897ea7e424759eb9b564ebe18 /arch/powerpc/kernel/ppc970-pmu.c
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff)
parentBtrfs: make sure the chunk allocator doesn't create zero length chunks (diff)
downloadlinux-d6cf853d4d73c268fc8920ac4e812ee26a12847c.tar.xz
linux-d6cf853d4d73c268fc8920ac4e812ee26a12847c.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: make sure the chunk allocator doesn't create zero length chunks Btrfs: fix data enospc check overflow
Diffstat (limited to 'arch/powerpc/kernel/ppc970-pmu.c')
0 files changed, 0 insertions, 0 deletions