summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-16 20:14:44 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-16 20:14:44 +0200
commitab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b (patch)
tree73c2ac345b631ee16ba07682c6c451fdce23b15f /arch/xtensa
parentMerge branch 'fixallnoconfig' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentKVM: uses TASKSTATS, depends on NET (diff)
downloadlinux-ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b.tar.xz
linux-ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b.zip
Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: uses TASKSTATS, depends on NET KVM: fix TASK_DELAY_ACCT kconfig warning
Diffstat (limited to 'arch/xtensa')
0 files changed, 0 insertions, 0 deletions