| commit | 8653b3f1d5bf2c7b09962a5747c74280758444ee | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 20 17:40:25 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 20 17:40:25 2011 -0700 |
| tree | bef0cf99c341f8d9212d069c18f9f7961f34bac9 | |
| parent | d09571059b89cf1a079afe88ecb64386f591b061 [diff] | |
| parent | ee176455e28469e2420032aab3db11ac2ae3eaa8 [diff] |
Merge branch 'stable/bug-fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/bug-fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: mask_rw_pte: do not apply the early_ioremap checks on x86_32 xen: do not create the extra e820 region at an addr lower than 4G