summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 22:09:48 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 22:09:48 +0400
commitae5cfc0546ca2698b9dcddf72accbd70e57590a0 (patch)
treeeb0fcb5ed1dbfbfe7a3c8ac564a42144b5eed88b /drivers/block
parent3dcf6c1b6b29f327ec24a1986aaa8eba399b463f (diff)
parentdc6821e0cfe74802aefd2067b40fcdc03fc4599e (diff)
downloadlinux-ae5cfc0546ca2698b9dcddf72accbd70e57590a0.tar.xz
Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/mmu: Fix compile errors introduced by x86/memblock mismerge.
Diffstat (limited to 'drivers/block')
0 files changed, 0 insertions, 0 deletions