summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2011-03-07Merge remote-tracking branch 'cleancache/linux-next'Stephen Rothwell
Conflicts: fs/ocfs2/super.c fs/super.c include/linux/fs.h mm/Kconfig
2011-03-07Merge remote-tracking branch 'usb/usb-next'Stephen Rothwell
Conflicts: arch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-omap3evm.c arch/arm/mach-omap2/board-overo.c arch/arm/mach-omap2/clock3xxx_data.c arch/arm/mach-omap2/usb-musb.c arch/arm/plat-omap/include/plat/usb.h drivers/usb/gadget/Kconfig drivers/usb/gadget/fsl_mxc_udc.c drivers/usb/musb/musb_core.h
2011-03-07Merge remote-tracking branch 'tty/tty-next'Stephen Rothwell
Conflicts: drivers/tty/serial/Kconfig drivers/tty/serial/Makefile
2011-03-07Merge remote-tracking branch 'driver-core/driver-core-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'workqueues/for-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'percpu/for-next'Stephen Rothwell
Conflicts: arch/x86/kernel/vmlinux.lds.S
2011-03-07Merge remote-tracking branch 'edac-amd/for-next'Stephen Rothwell
Conflicts: include/linux/pci_ids.h
2011-03-07Merge remote-tracking branch 'xen-pvhvm/linux-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'xen-two/linux-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'oprofile/for-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/kernel/acpi/sleep.c
2011-03-07Merge remote-tracking branch 'devicetree/devicetree/next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: drivers/Makefile include/linux/Kbuild lib/Kconfig
2011-03-07Merge remote-tracking branch 'suspend/linux-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'trivial/for-next'Stephen Rothwell
Conflicts: MAINTAINERS fs/eventpoll.c
2011-03-07Merge remote-tracking branch 'watchdog/master'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'omap_dss2/for-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'mfd/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-imx/mach-mx27_3ds.c arch/arm/mach-imx/mach-pcm038.c arch/arm/mach-mx3/mach-mx31_3ds.c arch/arm/mach-mx3/mach-mx31moboard.c drivers/mfd/davinci_voicecodec.c drivers/mfd/ucb1x00-ts.c drivers/mfd/wm8994-core.c
2011-03-07Merge remote-tracking branch 'kgdb/kgdb-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'mmc/mmc-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'input/next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'cpufreq/next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'sound/for-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'crypto/master'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'async_tx/next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'kvm/linux-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'acpi/test'Stephen Rothwell
Conflicts: arch/alpha/Kconfig arch/parisc/Kconfig arch/sparc/Kconfig
2011-03-07Merge remote-tracking branch 'bjdooks-i2c/next-i2c'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'pci/linux-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'xtensa/master'Stephen Rothwell
Conflicts: arch/xtensa/configs/iss_defconfig
2011-03-07Merge remote-tracking branch 'unicore32/unicore32'Stephen Rothwell
Conflicts: drivers/video/Kconfig
2011-03-07Merge remote-tracking branch 'sparc/master'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'sh/sh-latest'Stephen Rothwell
2011-03-07Merge remote-tracking branch 's390/features'Stephen Rothwell
2011-03-07Merge remote-tracking branch '4xx/next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'powerpc/next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'parisc/for-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'mips/mips-for-linux-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'm68knommu/for-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'm68k/for-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'ia64/test'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'cris/for-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'ux500-core/ux500-core'Stephen Rothwell
Conflicts: arch/arm/configs/u8500_defconfig arch/arm/mach-ux500/cpu-db8500.c
2011-03-07Merge remote-tracking branch 'tegra/for-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 's5p/for-next'Stephen Rothwell
Conflicts: arch/arm/mm/Kconfig
2011-03-07Merge remote-tracking branch 'samsung/next-samsung'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'omap/for-next'Stephen Rothwell
2011-03-07Merge remote-tracking branch 'msm/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-msm/board-msm7x27.c arch/arm/mach-msm/board-msm7x30.c arch/arm/mach-msm/board-qsd8x50.c arch/arm/mach-msm/board-sapphire.c arch/arm/mach-msm/include/mach/memory.h
2011-03-07Merge remote-tracking branch 'i.MX/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-mxs/gpio.c
2011-03-07Merge remote-tracking branch 'davinci/davinci-next'Stephen Rothwell