]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3148140 7693dec)
Merge tag 'stable/for-linus-3.14-rc5-tag' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Mar 2014 17:53:24 +0000 (09:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Mar 2014 17:53:24 +0000 (09:53 -0800)
Pull Xen fix from Konrad Rzeszutek Wilk:
 "This has exactly one patch for Xen ARM.  It sets the dependency to
  compile the kernel with MMU enabled - otherwise - the guest won't work
  very well"

* tag 'stable/for-linus-3.14-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  ARM: XEN depends on having a MMU

1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
XArray, radix tree and IDR