diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-18 11:48:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-18 11:48:48 -0700 |
commit | a0a6a39ecb11cefe0d7e6e07997306fb5ab2b07e (patch) | |
tree | 35dfe4099b54dbc6971ef115c2e4d39cefd24413 /fs/xattr.c | |
parent | bab58350e565756df9e45daafe8301a309b35e7e (diff) | |
parent | 83dac59409387789b88bed40b1be86a8abc572be (diff) | |
download | linux-3.10-a0a6a39ecb11cefe0d7e6e07997306fb5ab2b07e.tar.gz linux-3.10-a0a6a39ecb11cefe0d7e6e07997306fb5ab2b07e.tar.bz2 linux-3.10-a0a6a39ecb11cefe0d7e6e07997306fb5ab2b07e.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt:
"Here are a handful of powerpc related fixes."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.
cpuidle/powerpc: Fix smt_snooze_delay functionality.
cpuidle/powerpc: Fix target residency initialisation in pseries cpuidle
powerpc: Build fix for powerpc KVM
Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events"
Diffstat (limited to 'fs/xattr.c')
0 files changed, 0 insertions, 0 deletions