From: Tony Lindgren <tony@atomide.com>
Date: Fri, 26 Jun 2009 09:36:38 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~46
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c5cb7862d32cb344be7831d466535d5255e35ac;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:
	arch/arm/Makefile
	arch/arm/boot/compressed/Makefile
	arch/arm/configs/davinci_all_defconfig
	arch/arm/include/asm/pgtable.h
	arch/arm/mach-at91/clock.c
	arch/arm/mach-at91/include/mach/at91_pmc.h
	arch/arm/mach-davinci/Makefile
	arch/arm/mach-davinci/board-dm644x-evm.c
	arch/arm/mach-davinci/clock.c
	arch/arm/mach-davinci/clock.h
	arch/arm/mach-davinci/devices.c
	arch/arm/mach-davinci/dm644x.c
	arch/arm/mach-davinci/gpio.c
	arch/arm/mach-davinci/include/mach/common.h
	arch/arm/mach-davinci/include/mach/cputype.h
	arch/arm/mach-davinci/include/mach/debug-macro.S
	arch/arm/mach-davinci/include/mach/dm644x.h
	arch/arm/mach-davinci/include/mach/edma.h
	arch/arm/mach-davinci/include/mach/entry-macro.S
	arch/arm/mach-davinci/include/mach/gpio.h
	arch/arm/mach-davinci/include/mach/irqs.h
	arch/arm/mach-davinci/include/mach/memory.h
	arch/arm/mach-davinci/include/mach/mux.h
	arch/arm/mach-davinci/include/mach/psc.h
	arch/arm/mach-davinci/include/mach/serial.h
	arch/arm/mach-davinci/include/mach/uncompress.h
	arch/arm/mach-davinci/io.c
	arch/arm/mach-davinci/irq.c
	arch/arm/mach-davinci/mux.c
	arch/arm/mach-davinci/psc.c
	arch/arm/mach-davinci/serial.c
	arch/arm/mach-davinci/time.c
	arch/arm/mach-ixp4xx/Kconfig
	arch/arm/mach-ixp4xx/Makefile
	arch/arm/mach-ixp4xx/include/mach/cpu.h
	arch/arm/mach-ixp4xx/include/mach/qmgr.h
	arch/arm/mach-ixp4xx/ixp4xx_npe.c
	arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
	arch/arm/mach-mx1/generic.c
	arch/arm/mach-mx1/mx1ads.c
	arch/arm/mach-mx1/scb9328.c
	arch/arm/mach-mx2/generic.c
	arch/arm/mach-mx2/mx27ads.c
	arch/arm/mach-mx2/pcm038.c
	arch/arm/mach-mx2/pcm970-baseboard.c
	arch/arm/mach-mx3/devices.c
	arch/arm/mach-mx3/iomux.c
	arch/arm/mach-mx3/mm.c
	arch/arm/mach-mx3/mx31ads.c
	arch/arm/mach-mx3/mx31lite.c
	arch/arm/mach-mx3/mx31moboard-devboard.c
	arch/arm/mach-mx3/mx31moboard-marxbot.c
	arch/arm/mach-mx3/mx31moboard.c
	arch/arm/mach-mx3/pcm037.c
	arch/arm/mach-mx3/qong.c
	arch/arm/mach-omap2/Makefile
	arch/arm/plat-mxc/Kconfig
	arch/arm/plat-mxc/Makefile
	arch/arm/plat-mxc/gpio.c
	arch/arm/plat-mxc/include/mach/board-mx31ads.h
	arch/arm/plat-mxc/include/mach/board-mx31lite.h
	arch/arm/plat-mxc/include/mach/board-mx31moboard.h
	arch/arm/plat-mxc/include/mach/board-mx31pdk.h
	arch/arm/plat-mxc/include/mach/board-pcm037.h
	arch/arm/plat-mxc/include/mach/board-pcm038.h
	arch/arm/plat-mxc/include/mach/board-qong.h
	arch/arm/plat-mxc/include/mach/common.h
	arch/arm/plat-mxc/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/imxfb.h
	arch/arm/plat-mxc/include/mach/iomux-mx3.h
	arch/arm/plat-mxc/include/mach/memory.h
	arch/arm/plat-mxc/include/mach/mx1.h
	arch/arm/plat-mxc/include/mach/mx3x.h
	arch/arm/plat-mxc/include/mach/usb.h
	arch/arm/plat-mxc/irq.c
	arch/arm/plat-mxc/pwm.c
	arch/arm/plat-mxc/time.c
	drivers/Makefile
	drivers/rtc/rtc-ep93xx.c
	drivers/usb/host/isp1760-hcd.c
	drivers/video/mx3fb.c
---

7c5cb7862d32cb344be7831d466535d5255e35ac
Reading git-diff-tree failed