summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-15 18:49:16 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-15 18:49:16 +0100
commit27d2a8b97ebc4467e47722415b81ebe72d5f654f (patch)
tree043cbe45ba6ecc6a0bc714aee4e03e3cec097645 /arch/arm/mach-mxs/include
parentMerge branch 'stable/irq.cleanup' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentxen: ia64 build broken due to "xen: switch to new schedop hypercall by default." (diff)
parentxen: Union the blkif_request request specific fields (diff)
parentxen: annotate functions which only call into __init at start of day (diff)
downloadlinux-27d2a8b97ebc4467e47722415b81ebe72d5f654f.tar.xz
linux-27d2a8b97ebc4467e47722415b81ebe72d5f654f.zip
Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/ia64' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: ia64 build broken due to "xen: switch to new schedop hypercall by default." * 'stable/blkfront-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: Union the blkif_request request specific fields * 'stable/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: annotate functions which only call into __init at start of day xen p2m: annotate variable which appears unused xen: events: mark cpu_evtchn_mask_p as __refdata