From: Stephen Rothwell Date: Tue, 11 Oct 2011 01:37:06 +0000 (+1100) Subject: Merge remote-tracking branch 'arm-soc/for-next' X-Git-Tag: next-20111011~106 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=57e1b130d93c3eba5b87fc92f3c27bc8963eb819;p=karo-tx-linux.git Merge remote-tracking branch 'arm-soc/for-next' Conflicts: Documentation/devicetree/bindings/arm/l2cc.txt arch/arm/boot/compressed/Makefile arch/arm/include/asm/hardware/cache-l2x0.h arch/arm/kernel/smp.c arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-mxs/include/mach/gpio.h arch/arm/mach-nuc93x/Makefile.boot arch/arm/mach-picoxcell/include/mach/uncompress.h arch/arm/mach-tegra/board-paz00.h arch/arm/mach-tegra/board-seaboard.h arch/arm/mach-u300/Makefile.boot arch/arm/mm/cache-l2x0.c arch/arm/plat-mxc/include/mach/gpio.h --- 57e1b130d93c3eba5b87fc92f3c27bc8963eb819 diff --cc arch/arm/mach-msm/board-msm8x60.c index 9221f54778be,10fa8f6e32c9..4ad2afb86506 --- a/arch/arm/mach-msm/board-msm8x60.c +++ b/arch/arm/mach-msm/board-msm8x60.c @@@ -20,7 -14,10 +14,11 @@@ #include #include #include +#include + #include + #include + #include + #include #include #include @@@ -81,9 -62,42 +79,44 @@@ static void __init msm8x60_init(void { } + #ifdef CONFIG_OF + static struct of_dev_auxdata msm_auxdata_lookup[] __initdata = { + {} + }; + + static struct of_device_id msm_dt_gic_match[] __initdata = { + { .compatible = "qcom,msm-8660-qgic", }, + {} + }; + + static void __init msm8x60_dt_init(void) + { + struct device_node *node; + + node = of_find_matching_node_by_address(NULL, msm_dt_gic_match, + MSM8X60_QGIC_DIST_PHYS); + if (node) + irq_domain_add_simple(node, GIC_SPI_START); + + if (of_machine_is_compatible("qcom,msm8660-surf")) { + printk(KERN_INFO "Init surf UART registers\n"); + msm8x60_init_uart12dm(); + } + + of_platform_populate(NULL, of_default_bus_match_table, + msm_auxdata_lookup, NULL); + } + + static const char *msm8x60_fluid_match[] __initdata = { + "qcom,msm8660-fluid", + "qcom,msm8660-surf", + NULL + }; + #endif /* CONFIG_OF */ + MACHINE_START(MSM8X60_RUMI3, "QCT MSM8X60 RUMI3") + .fixup = msm8x60_fixup, + .reserve = msm8x60_reserve, .map_io = msm8x60_map_io, .init_irq = msm8x60_init_irq, .init_machine = msm8x60_init, @@@ -116,3 -124,14 +149,16 @@@ MACHINE_START(MSM8X60_FFA, "QCT MSM8X6 .init_machine = msm8x60_init, .timer = &msm_timer, MACHINE_END + + #ifdef CONFIG_OF + /* TODO: General device tree support for all MSM. */ + DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") ++ .fixup = msm8x60_fixup, ++ .reserve = msm8x60_reserve, + .map_io = msm8x60_map_io, + .init_irq = msm8x60_init_irq, + .init_machine = msm8x60_dt_init, + .timer = &msm_timer, + .dt_compat = msm8x60_fluid_match, + MACHINE_END + #endif /* CONFIG_OF */ diff --cc arch/arm/mach-mxs/include/mach/gpio.h index bb11e63261e4,56025aa0a639..01ee648b1c7e --- a/arch/arm/mach-mxs/include/mach/gpio.h +++ b/arch/arm/mach-mxs/include/mach/gpio.h @@@ -20,8 -20,12 +20,4 @@@ #ifndef __MACH_MXS_GPIO_H__ #define __MACH_MXS_GPIO_H__ - #define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr)) -#include -- - #define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START) -/* use gpiolib dispatchers */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep -#define gpio_to_irq __gpio_to_irq -- #endif /* __MACH_MXS_GPIO_H__ */ diff --cc arch/arm/mach-tegra/board-paz00.h index 42ce8639b90c,86057c3fb9a0..2dc189998b15 --- a/arch/arm/mach-tegra/board-paz00.h +++ b/arch/arm/mach-tegra/board-paz00.h @@@ -17,12 -17,18 +17,20 @@@ #ifndef _MACH_TEGRA_BOARD_PAZ00_H #define _MACH_TEGRA_BOARD_PAZ00_H +#include + - #define TEGRA_GPIO_SD1_CD TEGRA_GPIO_PV5 - #define TEGRA_GPIO_SD1_WP TEGRA_GPIO_PH1 - #define TEGRA_GPIO_SD1_POWER TEGRA_GPIO_PT3 - #define TEGRA_ULPI_RST TEGRA_GPIO_PV0 + /* SDCARD */ + #define TEGRA_GPIO_SD1_CD TEGRA_GPIO_PV5 + #define TEGRA_GPIO_SD1_WP TEGRA_GPIO_PH1 + #define TEGRA_GPIO_SD1_POWER TEGRA_GPIO_PT3 + + /* ULPI */ + #define TEGRA_ULPI_RST TEGRA_GPIO_PV0 + + /* WIFI */ + #define TEGRA_WIFI_PWRN TEGRA_GPIO_PK5 + #define TEGRA_WIFI_RST TEGRA_GPIO_PD1 + #define TEGRA_WIFI_LED TEGRA_GPIO_PD0 void paz00_pinmux_init(void); diff --cc arch/arm/mach-tegra/board-seaboard.h index 15b6c57361be,d06c3342e2c4..4c45d4ca3c49 --- a/arch/arm/mach-tegra/board-seaboard.h +++ b/arch/arm/mach-tegra/board-seaboard.h @@@ -17,8 -17,9 +17,11 @@@ #ifndef _MACH_TEGRA_BOARD_SEABOARD_H #define _MACH_TEGRA_BOARD_SEABOARD_H +#include + + #define SEABOARD_GPIO_TPS6586X(_x_) (TEGRA_NR_GPIOS + (_x_)) + #define SEABOARD_GPIO_WM8903(_x_) (SEABOARD_GPIO_TPS6586X(4) + (_x_)) + #define TEGRA_GPIO_SD2_CD TEGRA_GPIO_PI5 #define TEGRA_GPIO_SD2_WP TEGRA_GPIO_PH1 #define TEGRA_GPIO_SD2_POWER TEGRA_GPIO_PI6 diff --cc arch/arm/mach-u300/Makefile.boot index 69357affbd77,a06bb0deadfe..87811de0bd94 --- a/arch/arm/mach-u300/Makefile.boot +++ b/arch/arm/mach-u300/Makefile.boot @@@ -1,15 -1,4 +1,4 @@@ - # Note: the following conditions must always be true: - # ZRELADDR == virt_to_phys(TEXTADDR) - # PARAMS_PHYS must be within 4MB of ZRELADDR - # INITRD_PHYS must be in RAM - - ifdef CONFIG_MACH_U300_SINGLE_RAM - zreladdr-y += 0x28E08000 - params_phys-y := 0x28E00100 - else - zreladdr-y += 0x48008000 - params_phys-y := 0x48000100 - endif - - zreladdr-y := 0x48008000 ++ zreladdr-y += 0x48008000 + params_phys-y := 0x48000100 # This isn't used. - #initrd_phys-y := 0x29800000 + #initrd_phys-y := 0x48800000 diff --cc arch/arm/mach-vexpress/hotplug.c index 3668cf91d2de,2866ed8c4b05..813ee08f96e6 --- a/arch/arm/mach-vexpress/hotplug.c +++ b/arch/arm/mach-vexpress/hotplug.c @@@ -63,9 -62,15 +63,9 @@@ static inline void platform_do_lowpower * code will have already disabled interrupts */ for (;;) { - /* - * here's the WFI - */ - asm(".word 0xe320f003\n" - : - : - : "memory", "cc"); + wfi(); - if (pen_release == cpu) { + if (pen_release == cpu_logical_map(cpu)) { /* * OK, proper wakeup, we're done */ diff --cc arch/arm/plat-mxc/include/mach/gpio.h index 3e1ffc8b8f0c,44af0064ba1a..593ce13adfa7 --- a/arch/arm/plat-mxc/include/mach/gpio.h +++ b/arch/arm/plat-mxc/include/mach/gpio.h @@@ -21,13 -21,12 +21,5 @@@ #include #include -#include - -/* use gpiolib dispatchers */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep -#define gpio_to_irq __gpio_to_irq - - /* There's a off-by-one betweem the gpio bank number and the gpiochip */ - /* range e.g. GPIO_1_5 is gpio 5 under linux */ - #define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr)) - - #define gpio_to_irq(gpio) (MXC_GPIO_IRQ_START + (gpio)) - #define irq_to_gpio(irq) ((irq) - MXC_GPIO_IRQ_START) - #endif diff --cc arch/arm/plat-omap/devices.c index 64c3bd4aa54e,bd9a06b3ee89..acd132c29647 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@@ -24,55 -24,10 +24,9 @@@ #include #include #include -#include #include - #include #include - /*-------------------------------------------------------------------------*/ - - #if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE) - - static struct platform_device **omap_mcbsp_devices; - - void omap_mcbsp_register_board_cfg(struct resource *res, int res_count, - struct omap_mcbsp_platform_data *config, int size) - { - int i; - - omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *), - GFP_KERNEL); - if (!omap_mcbsp_devices) { - printk(KERN_ERR "Could not register McBSP devices\n"); - return; - } - - for (i = 0; i < size; i++) { - struct platform_device *new_mcbsp; - int ret; - - new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1); - if (!new_mcbsp) - continue; - platform_device_add_resources(new_mcbsp, &res[i * res_count], - res_count); - new_mcbsp->dev.platform_data = &config[i]; - ret = platform_device_add(new_mcbsp); - if (ret) { - platform_device_put(new_mcbsp); - continue; - } - omap_mcbsp_devices[i] = new_mcbsp; - } - } - - #else - void omap_mcbsp_register_board_cfg(struct resource *res, int res_count, - struct omap_mcbsp_platform_data *config, int size) - { } - #endif - - /*-------------------------------------------------------------------------*/ - #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \ defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE) diff --cc x1 index 000000000000,000000000000..e580faf3f3f4 new file mode 100644 --- /dev/null +++ b/x1 @@@ -1,0 -1,0 +1,240 @@@ ++refs/remotes/4xx/next ++refs/remotes/52xx-and-virtex-current/merge ++refs/remotes/52xx-and-virtex-current/powerpc/merge ++refs/remotes/52xx-and-virtex/next ++refs/remotes/52xx-and-virtex/powerpc/next ++refs/remotes/acpi/acpi ++refs/remotes/agp/agp-next ++refs/remotes/apm/for-next ++refs/remotes/arm-current/fixes ++refs/remotes/arm-dt/devicetree/arm-next ++refs/remotes/arm-lpae/for-next ++refs/remotes/arm-soc/for-next ++refs/remotes/arm-soc/master ++refs/remotes/arm/devel ++refs/remotes/arm/for-next ++refs/remotes/arm/master ++refs/remotes/asm-generic/next ++refs/remotes/async_tx/next ++refs/remotes/at91/at91-next ++refs/remotes/audit-current/for-linus ++refs/remotes/audit/for-linus ++refs/remotes/audit/for-next ++refs/remotes/backlight/for-mm ++refs/remotes/battery/master ++refs/remotes/bdev/base ++refs/remotes/bdev/for-linus ++refs/remotes/bdev/master ++refs/remotes/bjdooks-i2c/next-i2c ++refs/remotes/bkl-config/config ++refs/remotes/blackfin/for-linus ++refs/remotes/block/for-next ++refs/remotes/bluetooth/master ++refs/remotes/c6x/for-linux-next ++refs/remotes/catalin/for-next ++refs/remotes/ceph/for-next ++refs/remotes/cifs/master ++refs/remotes/configfs/linux-next ++refs/remotes/const-sections/const-sections ++refs/remotes/cpufreq-current/fixes ++refs/remotes/cpufreq/fixes ++refs/remotes/cpufreq/next ++refs/remotes/cpupowerutils/cpupowerutils ++refs/remotes/cpupowerutils/master ++refs/remotes/cputime/cputime ++refs/remotes/creds/creds-v3 ++refs/remotes/cris/for-next ++refs/remotes/crypto-current/master ++refs/remotes/crypto/master ++refs/remotes/davinci/davinci-next ++refs/remotes/davinci/for-next ++refs/remotes/devicetree-current/devicetree/merge ++refs/remotes/devicetree/devicetree/next ++refs/remotes/devicetree/next-devicetree ++refs/remotes/dlm/next ++refs/remotes/docs/docs-move ++refs/remotes/drbd/drbd ++refs/remotes/driver-core.current/driver-core-linus ++refs/remotes/driver-core/driver-core-next ++refs/remotes/drivers-x86/for_linus ++refs/remotes/drivers-x86/linux-next ++refs/remotes/drm/drm-next ++refs/remotes/dwmw2-iommu/master ++refs/remotes/dwmw2/master ++refs/remotes/ecryptfs/next ++refs/remotes/edac-amd/for-next ++refs/remotes/edac/linux_next ++refs/remotes/embedded/master ++refs/remotes/ext3/for_next ++refs/remotes/ext4/dev ++refs/remotes/ext4/next ++refs/remotes/fatfs/master ++refs/remotes/fbdev/fbdev-next ++refs/remotes/fbdev/master ++refs/remotes/firmware/master ++refs/remotes/fixes/fixes ++refs/remotes/fsnotify/for-next ++refs/remotes/fuse/for-next ++refs/remotes/galak/next ++refs/remotes/gfs2/master ++refs/remotes/gpio/gpio/next ++refs/remotes/hdlc/hdlc-next ++refs/remotes/hfsplus/for-next ++refs/remotes/hid/for-next ++refs/remotes/hwmon-staging/hwmon-next ++refs/remotes/hwpoison/hwpoison ++refs/remotes/hwspinlock/linux-next ++refs/remotes/i.MX/for-next ++refs/remotes/i7300_edac/linux_next ++refs/remotes/ia64/next ++refs/remotes/ibft/master ++refs/remotes/ide-next/master ++refs/remotes/ide/master ++refs/remotes/idle-test/idle-test ++refs/remotes/ieee1394/for-next ++refs/remotes/infiniband/for-next ++refs/remotes/input-current/for-linus ++refs/remotes/input-mt/next ++refs/remotes/input/for-linus ++refs/remotes/input/next ++refs/remotes/iommu/next ++refs/remotes/irda/for-next ++refs/remotes/iscsi-target/for-next ++refs/remotes/jc-viafb/viafb-next ++refs/remotes/jc_docs/docs-next ++refs/remotes/jfs/next ++refs/remotes/kbuild-current/for-linus ++refs/remotes/kbuild-current/master ++refs/remotes/kbuild-current/rc-fixes ++refs/remotes/kbuild/for-linus ++refs/remotes/kbuild/for-next ++refs/remotes/kbuild/master ++refs/remotes/kbuild/rc-fixes ++refs/remotes/kconfig/for-next ++refs/remotes/kgdb/kgdb-next ++refs/remotes/kmemleak/kmemleak ++refs/remotes/kvm/kvm-updates/2.6.31 ++refs/remotes/kvm/kvm-updates/3.2 ++refs/remotes/kvm/linux-next ++refs/remotes/kvm/master ++refs/remotes/kvmtool/master ++refs/remotes/l2-mtd/master ++refs/remotes/lblnet/master ++refs/remotes/leds/for-mm ++refs/remotes/libata/NEXT ++refs/remotes/linux-spec/for-next ++refs/remotes/logfs/master ++refs/remotes/lsm/for-next ++refs/remotes/m68k-current/for-linus ++refs/remotes/m68k/for-linus ++refs/remotes/m68k/for-next ++refs/remotes/m68knommu/for-next ++refs/remotes/md-current/for-linus ++refs/remotes/md/for-linus ++refs/remotes/md/for-next ++refs/remotes/mfd/for-next ++refs/remotes/microblaze/next ++refs/remotes/mips/mips-for-linux-next ++refs/remotes/mmc/mmc-next ++refs/remotes/moduleh/for-sfr ++refs/remotes/moduleh/module.h-split ++refs/remotes/mtd/master ++refs/remotes/namespace/master ++refs/remotes/net-next/master ++refs/remotes/net/master ++refs/remotes/nfs/linux-next ++refs/remotes/nfsd/nfsd-next ++refs/remotes/nilfs2/for-next ++refs/remotes/nommu/master ++refs/remotes/ocfs2/linux-next ++refs/remotes/omap/for-next ++refs/remotes/omap_dss2/for-next ++refs/remotes/omap_dss2/master ++refs/remotes/omfs/for-next ++refs/remotes/openrisc/for-upstream ++refs/remotes/oprofile/for-next ++refs/remotes/origin/master ++refs/remotes/osd/linux-next ++refs/remotes/parisc/for-next ++refs/remotes/parisc/master ++refs/remotes/parisc/next ++refs/remotes/pci-current/for-linus ++refs/remotes/pci/for-linus ++refs/remotes/pci/linux-next ++refs/remotes/pcmcia/master ++refs/remotes/percpu/for-next ++refs/remotes/pinctrl/for-next ++refs/remotes/pm/linux-next ++refs/remotes/powerpc-merge/merge ++refs/remotes/powerpc/merge ++refs/remotes/powerpc/next ++refs/remotes/powertools/tools-test ++refs/remotes/ptrace/ptrace ++refs/remotes/pxa/for-next ++refs/remotes/rcu/rcu/next ++refs/remotes/regmap/for-next ++refs/remotes/regulator/for-next ++refs/remotes/rmobile-current/rmobile-fixes-for-linus ++refs/remotes/rmobile/rmobile-latest ++refs/remotes/s390/features ++refs/remotes/s5p/for-next ++refs/remotes/samsung/next-samsung ++refs/remotes/scsi-post-merge/master ++refs/remotes/scsi-post-merge/merge-base ++refs/remotes/scsi-rc-fixes/master ++refs/remotes/scsi/master ++refs/remotes/security/next ++refs/remotes/selinux/master ++refs/remotes/sfi/sfi-test ++refs/remotes/sh-current/sh-fixes-for-linus ++refs/remotes/sh/sh-latest ++refs/remotes/slab/for-next ++refs/remotes/slave-dma/next ++refs/remotes/sound-asoc/for-next ++refs/remotes/sound-current/for-linus ++refs/remotes/sound/for-linus ++refs/remotes/sound/for-next ++refs/remotes/sparc-next/master ++refs/remotes/sparc/master ++refs/remotes/spi-current/spi/merge ++refs/remotes/spi/next-spi ++refs/remotes/spi/spi/next ++refs/remotes/squashfs/master ++refs/remotes/staging.current/staging-linus ++refs/remotes/staging/staging-next ++refs/remotes/swiotlb/master ++refs/remotes/sysctl/master ++refs/remotes/tegra/for-next ++refs/remotes/tile/master ++refs/remotes/tip/auto-latest ++refs/remotes/tmem/tmem ++refs/remotes/trivial/for-next ++refs/remotes/tty.current/tty-linus ++refs/remotes/tty/tty-next ++refs/remotes/tuxonice/master ++refs/remotes/ubi/linux-next ++refs/remotes/ubifs/linux-next ++refs/remotes/uclinux/for-next ++refs/remotes/udf/for_next ++refs/remotes/unicore32/unicore32 ++refs/remotes/usb.current/usb-linus ++refs/remotes/usb/usb-next ++refs/remotes/ux500-core/ux500-core ++refs/remotes/v4l-dvb/master ++refs/remotes/v9fs/for-next ++refs/remotes/vfs-scale/vfs-scale-working ++refs/remotes/vfs/for-next ++refs/remotes/viafb/viafb-next ++refs/remotes/watchdog/master ++refs/remotes/wireless-current/master ++refs/remotes/wireless/master ++refs/remotes/wireless/merge-test ++refs/remotes/workqueues/for-next ++refs/remotes/writeback/writeback-for-next ++refs/remotes/xen-pvhvm/linux-next ++refs/remotes/xen-two/linux-next ++refs/remotes/xen-two/master ++refs/remotes/xen/upstream/xen ++refs/remotes/xfs/master ++refs/remotes/xilinx/arm-next ++refs/remotes/xtensa/master diff --cc x2 index 000000000000,000000000000..63943c2c3a65 new file mode 100644 --- /dev/null +++ b/x2 @@@ -1,0 -1,0 +1,205 @@@ ++refs/remotes/4xx/next ++refs/remotes/52xx-and-virtex-current/powerpc/merge ++refs/remotes/52xx-and-virtex/powerpc/next ++refs/remotes/acpi/acpi ++refs/remotes/agp/agp-next ++refs/remotes/apm/for-next ++refs/remotes/arm-current/fixes ++refs/remotes/arm-dt/devicetree/arm-next ++refs/remotes/arm-lpae/for-next ++refs/remotes/arm-soc/for-next ++refs/remotes/arm/for-next ++refs/remotes/asm-generic/next ++refs/remotes/async_tx/next ++refs/remotes/at91/at91-next ++refs/remotes/audit-current/for-linus ++refs/remotes/audit/for-linus ++refs/remotes/audit/for-next ++refs/remotes/backlight/for-mm ++refs/remotes/battery/master ++refs/remotes/bjdooks-i2c/next-i2c ++refs/remotes/bkl-config/config ++refs/remotes/blackfin/for-linus ++refs/remotes/block/for-next ++refs/remotes/bluetooth/master ++refs/remotes/c6x/for-linux-next ++refs/remotes/catalin/for-next ++refs/remotes/ceph/for-next ++refs/remotes/cifs/master ++refs/remotes/configfs/linux-next ++refs/remotes/const-sections/const-sections ++refs/remotes/cpufreq-current/fixes ++refs/remotes/cpufreq/fixes ++refs/remotes/cpufreq/next ++refs/remotes/cpupowerutils/master ++refs/remotes/cputime/cputime ++refs/remotes/cris/for-next ++refs/remotes/crypto-current/master ++refs/remotes/crypto/master ++refs/remotes/davinci/davinci-next ++refs/remotes/devicetree-current/devicetree/merge ++refs/remotes/devicetree/devicetree/next ++refs/remotes/dlm/next ++refs/remotes/docs/docs-move ++refs/remotes/driver-core.current/driver-core-linus ++refs/remotes/driver-core/driver-core-next ++refs/remotes/drivers-x86/for_linus ++refs/remotes/drivers-x86/linux-next ++refs/remotes/drm/drm-next ++refs/remotes/dwmw2-iommu/master ++refs/remotes/dwmw2/master ++refs/remotes/ecryptfs/next ++refs/remotes/edac-amd/for-next ++refs/remotes/edac/linux_next ++refs/remotes/embedded/master ++refs/remotes/ext3/for_next ++refs/remotes/ext4/dev ++refs/remotes/fatfs/master ++refs/remotes/fbdev/fbdev-next ++refs/remotes/firmware/master ++refs/remotes/fixes/fixes ++refs/remotes/fsnotify/for-next ++refs/remotes/fuse/for-next ++refs/remotes/galak/next ++refs/remotes/gfs2/master ++refs/remotes/gpio/gpio/next ++refs/remotes/hdlc/hdlc-next ++refs/remotes/hfsplus/for-next ++refs/remotes/hid/for-next ++refs/remotes/hwmon-staging/hwmon-next ++refs/remotes/hwpoison/hwpoison ++refs/remotes/hwspinlock/linux-next ++refs/remotes/i.MX/for-next ++refs/remotes/i7300_edac/linux_next ++refs/remotes/ia64/next ++refs/remotes/ibft/master ++refs/remotes/ide-next/master ++refs/remotes/ide/master ++refs/remotes/idle-test/idle-test ++refs/remotes/ieee1394/for-next ++refs/remotes/infiniband/for-next ++refs/remotes/input-current/for-linus ++refs/remotes/input-mt/next ++refs/remotes/input/for-linus ++refs/remotes/input/next ++refs/remotes/iommu/next ++refs/remotes/irda/for-next ++refs/remotes/iscsi-target/for-next ++refs/remotes/jc_docs/docs-next ++refs/remotes/jfs/next ++refs/remotes/kbuild-current/rc-fixes ++refs/remotes/kbuild/for-next ++refs/remotes/kconfig/for-next ++refs/remotes/kgdb/kgdb-next ++refs/remotes/kmemleak/kmemleak ++refs/remotes/kvm/kvm-updates/3.2 ++refs/remotes/kvmtool/master ++refs/remotes/l2-mtd/master ++refs/remotes/lblnet/master ++refs/remotes/leds/for-mm ++refs/remotes/libata/NEXT ++refs/remotes/linux-spec/for-next ++refs/remotes/logfs/master ++refs/remotes/lsm/for-next ++refs/remotes/m68k-current/for-linus ++refs/remotes/m68k/for-linus ++refs/remotes/m68k/for-next ++refs/remotes/m68knommu/for-next ++refs/remotes/md-current/for-linus ++refs/remotes/md/for-linus ++refs/remotes/md/for-next ++refs/remotes/mfd/for-next ++refs/remotes/microblaze/next ++refs/remotes/mips/mips-for-linux-next ++refs/remotes/mmc/mmc-next ++refs/remotes/moduleh/for-sfr ++refs/remotes/mtd/master ++refs/remotes/namespace/master ++refs/remotes/net-next/master ++refs/remotes/net/master ++refs/remotes/nfs/linux-next ++refs/remotes/nfsd/nfsd-next ++refs/remotes/nilfs2/for-next ++refs/remotes/nommu/master ++refs/remotes/ocfs2/linux-next ++refs/remotes/omap/for-next ++refs/remotes/omap_dss2/for-next ++refs/remotes/omfs/for-next ++refs/remotes/openrisc/for-upstream ++refs/remotes/oprofile/for-next ++refs/remotes/osd/linux-next ++refs/remotes/parisc/for-next ++refs/remotes/pci-current/for-linus ++refs/remotes/pci/for-linus ++refs/remotes/pci/linux-next ++refs/remotes/pcmcia/master ++refs/remotes/percpu/for-next ++refs/remotes/pinctrl/for-next ++refs/remotes/pm/linux-next ++refs/remotes/powerpc-merge/merge ++refs/remotes/powerpc/next ++refs/remotes/powertools/tools-test ++refs/remotes/ptrace/ptrace ++refs/remotes/pxa/for-next ++refs/remotes/rcu/rcu/next ++refs/remotes/regmap/for-next ++refs/remotes/regulator/for-next ++refs/remotes/rmobile-current/rmobile-fixes-for-linus ++refs/remotes/rmobile/rmobile-latest ++refs/remotes/s390/features ++refs/remotes/s5p/for-next ++refs/remotes/samsung/next-samsung ++refs/remotes/scsi-post-merge/master ++refs/remotes/scsi-post-merge/merge-base ++refs/remotes/scsi-rc-fixes/master ++refs/remotes/scsi/master ++refs/remotes/security/next ++refs/remotes/selinux/master ++refs/remotes/sfi/sfi-test ++refs/remotes/sh-current/sh-fixes-for-linus ++refs/remotes/sh/sh-latest ++refs/remotes/slab/for-next ++refs/remotes/slave-dma/next ++refs/remotes/sound-asoc/for-next ++refs/remotes/sound-current/for-linus ++refs/remotes/sound/for-next ++refs/remotes/sparc-next/master ++refs/remotes/sparc/master ++refs/remotes/spi-current/spi/merge ++refs/remotes/spi/spi/next ++refs/remotes/squashfs/master ++refs/remotes/staging.current/staging-linus ++refs/remotes/staging/staging-next ++refs/remotes/swiotlb/master ++refs/remotes/sysctl/master ++refs/remotes/tegra/for-next ++refs/remotes/tile/master ++refs/remotes/tip/auto-latest ++refs/remotes/tmem/tmem ++refs/remotes/trivial/for-next ++refs/remotes/tty.current/tty-linus ++refs/remotes/tty/tty-next ++refs/remotes/ubi/linux-next ++refs/remotes/ubifs/linux-next ++refs/remotes/uclinux/for-next ++refs/remotes/udf/for_next ++refs/remotes/unicore32/unicore32 ++refs/remotes/usb.current/usb-linus ++refs/remotes/usb/usb-next ++refs/remotes/ux500-core/ux500-core ++refs/remotes/v4l-dvb/master ++refs/remotes/v9fs/for-next ++refs/remotes/vfs-scale/vfs-scale-working ++refs/remotes/vfs/for-next ++refs/remotes/viafb/viafb-next ++refs/remotes/watchdog/master ++refs/remotes/wireless-current/master ++refs/remotes/wireless/master ++refs/remotes/workqueues/for-next ++refs/remotes/writeback/writeback-for-next ++refs/remotes/xen-pvhvm/linux-next ++refs/remotes/xen-two/linux-next ++refs/remotes/xen/upstream/xen ++refs/remotes/xfs/master ++refs/remotes/xilinx/arm-next ++refs/remotes/xtensa/master diff --cc x3 index 000000000000,000000000000..570ecd1161e3 new file mode 100644 --- /dev/null +++ b/x3 @@@ -1,0 -1,0 +1,35 @@@ ++52xx-and-virtex-current/merge ++52xx-and-virtex/next ++arm-soc/master ++arm/devel ++arm/master ++bdev/base ++bdev/for-linus ++bdev/master ++cpupowerutils/cpupowerutils ++creds/creds-v3 ++davinci/for-next ++devicetree/next-devicetree ++drbd/drbd ++ext4/next ++fbdev/master ++jc-viafb/viafb-next ++kbuild-current/for-linus ++kbuild-current/master ++kbuild/for-linus ++kbuild/master ++kbuild/rc-fixes ++kvm/kvm-updates/2.6.31 ++kvm/linux-next ++kvm/master ++moduleh/module.h-split ++omap_dss2/master ++origin/master ++parisc/master ++parisc/next ++powerpc/merge ++sound/for-linus ++spi/next-spi ++tuxonice/master ++wireless/merge-test ++xen-two/master