Konrad Rzeszutek Wilk dc6821e0cf xen/mmu: Fix compile errors introduced by x86/memblock mismerge. ...

The git commit d4bbf7e775
"Merge branch 'master' into x86/memblock" mismerged the 32-bit
section causing:

arch/x86/xen/mmu.c: In function ‘xen_setup_kernel_pagetable’:
arch/x86/xen/mmu.c:1855: error: expected ‘;’ before ‘)’ token
arch/x86/xen/mmu.c:1855: error: expected statement before ‘)’ token

Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

2012-01-09 12:05:05 -05:00

..

alpha

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

arm

Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-11-20 14:34:58 -08:00

avr32

Merge git://git.infradead.org/mtd-2.6

2011-11-07 09:11:16 -08:00

blackfin

blackfin: Fixup export.h includes

2011-11-14 17:15:23 +08:00

cris

net: Fix references to deleted NET_ETHERNET Kconfig setting.

2011-11-09 19:26:53 -05:00

frv

kgdb: follow rename pack_hex_byte() to hex_byte_pack()

2011-10-31 17:30:56 -07:00

h8300

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

2011-10-29 07:27:45 -07:00

hexagon

Hexagon: Add basic stacktrace functionality for Hexagon architecture.

2011-11-01 07:34:21 -07:00

ia64

Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

2011-11-06 20:15:05 -08:00

m32r

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2011-11-06 18:54:53 -08:00

m68k

m68k/mac: Remove mac_irq_{en,dis}able() wrappers

2011-11-08 22:35:52 +01:00

microblaze

microblaze: bury asm/namei.h

2011-11-21 16:48:28 -05:00

mips

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2011-11-15 22:44:45 -02:00

mn10300

kgdb: follow rename pack_hex_byte() to hex_byte_pack()

2011-10-31 17:30:56 -07:00

openrisc

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2011-11-06 18:54:53 -08:00

parisc

parisc: Add export.h to files needing EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:31:00 -04:00

powerpc

Merge branch 'master' into x86/memblock

2011-11-28 09:46:22 -08:00

s390

Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2011-11-20 14:57:43 -08:00

score

score: drop unused Kconfig symbols

2011-10-31 23:39:51 +01:00

sh

Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus

2011-11-11 16:16:25 +09:00

sparc

Merge branch 'master' into x86/memblock

2011-11-28 09:46:22 -08:00

tile

Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile

2011-11-04 12:33:34 -07:00

um

Merge branch 'for-linus' of git://github.com/richardweinberger/linux

2011-11-02 09:45:39 -07:00

unicore32

unicore32, exec: remove redundant set_fs(USER_DS)

2011-11-16 10:50:09 +08:00

x86

xen/mmu: Fix compile errors introduced by x86/memblock mismerge.

2012-01-09 12:05:05 -05:00

xtensa

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2011-10-26 17:15:03 +02:00

.gitignore

…

Kconfig

…