summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2011-06-21Merge remote-tracking branch 'xen-two/linux-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'oprofile/for-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'kvm/linux-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'gpio/gpio/next'Stephen Rothwell
Conflicts: arch/arm/mach-ep93xx/Makefile drivers/gpio/gpio-ep93xx.c
2011-06-21Merge remote-tracking branch 'devicetree/devicetree/next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'trivial/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-ep93xx/dma-m2p.c arch/s390/kvm/sie64a.S drivers/mtd/maps/pxa2xx-flash.c
2011-06-21Merge remote-tracking branch 'watchdog/master'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'mmc/mmc-next'Stephen Rothwell
Conflicts: drivers/mmc/host/sdhci-of-core.c
2011-06-21Merge remote-tracking branch 'cpufreq/next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'crypto/master'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'l2-mtd/master'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'net/master'Stephen Rothwell
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_vs_core.c
2011-06-21Merge remote-tracking branch 'slave-dma/next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'idle-test/idle-test'Stephen Rothwell
Conflicts: arch/x86/kernel/process.c
2011-06-21Merge remote-tracking branch 'of-pci/of-pci'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'pci/linux-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'xtensa/master'Stephen Rothwell
Conflicts: arch/xtensa/configs/iss_defconfig
2011-06-21Merge remote-tracking branch 'unicore32/unicore32'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'tile/master'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'sh/sh-latest'Stephen Rothwell
2011-06-21Merge remote-tracking branch 's390/features'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'galak/next'Stephen Rothwell
Conflicts: arch/powerpc/boot/dts/p2020ds.dts arch/powerpc/boot/dts/p2020rdb.dts arch/powerpc/sysdev/mpic.c
2011-06-21Merge remote-tracking branch '52xx-and-virtex/powerpc/next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'powerpc/next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'mips/mips-for-linux-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'm68knommu/for-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'm68k/for-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'ia64/test'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'cris/for-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'blackfin/for-linus'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'xilinx/arm-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'ux500-core/ux500-core'Stephen Rothwell
2011-06-21Merge remote-tracking branch 's5p/for-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'msm/for-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'i.MX/for-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'at91/at91-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'arm-lpae/for-next'Stephen Rothwell
Conflicts: arch/arm/include/asm/pgalloc.h arch/arm/include/asm/pgtable.h arch/arm/include/asm/tlb.h arch/arm/mm/context.c arch/arm/mm/dma-mapping.c arch/arm/mm/proc-v7.S
2011-06-21Merge remote-tracking branch 'arm/for-next'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'tty.current/tty-linus'Stephen Rothwell
2011-06-21Merge remote-tracking branch 'pci-current/for-linus'Stephen Rothwell
2011-06-20ARM: mmp2: update mmp2_defconfig to support mmcZhangfei Gao
1. support brownstone 2. support mmc 3. support basic filesystem and language 4. remove dynamic_debug, since too many log during access sd Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com> Acked-by: Philip Rakity <prakity@marvell.com> Acked-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Chris Ball <cjb@laptop.org>
2011-06-20mmc: sdhci-pxa: move platform data to include/linux/platform_dataZhangfei Gao
As suggested by Arnd, move platform data to include/linux/platform_data in order to improve build coverage for the driver. Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Chris Ball <cjb@laptop.org>
2011-06-20mmc: update mmp2 mmc resources in arch/armZhangfei Gao
Update MMP2 platform code to "sdhci-pxav3", following the driver rename. Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com> Acked-by: Philip Rakity <prakity@marvell.com> Acked-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Chris Ball <cjb@laptop.org>
2011-06-20mmc: host: split up sdhci-pxa, create sdhci-pxav3.cZhangfei Gao
sdhci-pltfm driver for PXAV3 SoCs, such as MMP2. Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com> Signed-off-by: Philip Rakity <prakity@marvell.com> Acked-by: Philip Rakity <prakity@marvell.com> Acked-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Chris Ball <cjb@laptop.org>
2011-06-20ARM: Xilinx: Adding Xilinx board supportJohn Linn
The 1st board support is minimal to get a system up and running on the Xilinx platform. This platform reuses the clock implementation from plat-versatile, and it depends entirely on CONFIG_OF support. There is only one board support file which obtains all device information from a device tree dtb file which is passed to the kernel at boot time. Signed-off-by: John Linn <john.linn@xilinx.com>
2011-06-20Merge branch 'stable/bug.fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/setup: Fix for incorrect xen_extra_mem_start. xen: When calling power_off, don't call the halt function. xen: Fix compile warning when CONFIG_SMP is not defined. xen: support CONFIG_MAXSMP xen: partially revert "xen: set max_pfn_mapped to the last pfn mapped"
2011-06-20Merge branch 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds
* 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: Fix register corruption in pvclock_scale_delta KVM: MMU: fix opposite condition in mapping_level_dirty_bitmap KVM: VMX: do not overwrite uptodate vcpu->arch.cr3 on KVM_SET_SREGS KVM: MMU: Fix build warnings in walk_addr_generic()
2011-06-20treewide: remove duplicate includesVitaliy Ivanov
Many stupid corrections of duplicated includes based on the output of scripts/checkincludes.pl. Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-06-20[S390] cleanup program check handler prototypesMartin Schwidefsky
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>