Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform ...

* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>

2012-09-22 01:07:21 -07:00

..

am35x.c

usb: phy: fix return value check of usb_get_phy

2012-07-02 10:40:49 +03:00

blackfin.c

usb: phy: fix return value check of usb_get_phy

2012-07-02 10:40:49 +03:00

blackfin.h

usb: musb: drop a gigantic amount of ifdeferry

2011-07-01 14:31:10 -07:00

cppi_dma.c

usb: musb: cppi: add missing include to fix compilation

2012-05-14 12:45:45 -07:00

cppi_dma.h

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

da8xx.c

ARM: davinci: move platform_data definitions

2012-09-14 11:16:54 +02:00

davinci.c

Merge tag 'xceiv-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

2012-07-05 15:35:41 -07:00

davinci.h

usb: musb: davinci: Fix build breakage

2012-06-04 18:29:42 +03:00

Kconfig

usb: musb: Fix wrong config for am33xx and ti81xx

2012-08-03 09:30:42 +03:00

Makefile

usb: musb: Add support for ti81xx platform

2012-05-04 13:59:34 +03:00

musb_core.c

usb: otg: utils: rename function name in OTG utils

2012-06-25 14:04:26 +03:00

musb_core.h

usb/musb: remove conditional compilation of clk code

2012-07-30 17:25:12 -07:00

musb_debug.h

usb: musb: remove extern qualifier from musb_debug.h header

2011-12-21 13:21:02 +02:00

musb_debugfs.c

usb: musb: debugfs: fix error check

2012-02-01 11:02:46 +02:00

musb_dma.h

usb: musb: introduce api for dma code to check compatibility with usb request

2011-02-01 10:41:30 +02:00

musb_dsps.c

usb: musb: reorder runtime pm call

2012-08-03 09:30:44 +03:00

musb_gadget_ep0.c

usb: musb: headers cleanup

2011-12-12 11:51:52 +02:00

musb_gadget.c

Merge tag 'musb-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

2012-07-05 15:09:27 -07:00

musb_gadget.h

usb: musb: gadget: do not poke with gadget's list_head

2011-02-17 21:11:46 +02:00

musb_host.c

usb: musb: host: fix for musb_start_urb Oops

2012-09-06 19:52:26 +03:00

musb_host.h

usb: musb: drop a gigantic amount of ifdeferry

2011-07-01 14:31:10 -07:00

musb_io.h

m68k: Make sure {read,write}s[bwl]() are always defined

2012-04-22 20:16:50 +02:00

musb_regs.h

usb: musb: tusb6010: fix compilation

2011-08-12 11:52:50 +03:00

musb_virthub.c

usb: musb: Start using struct usb_otg

2012-02-13 13:52:54 +02:00

musbhsdma.c

usb: musb: musbhsdma: fix IRQ check

2012-09-06 19:52:28 +03:00

musbhsdma.h

Merge branches 'devel-cleanup', 'devel-board', 'devel-early-init' and 'devel-ti816x' into omap-for-linus

2011-02-16 11:32:38 -08:00

omap2430.c

usb: phy: fix return value check of usb_get_phy

2012-07-02 10:40:49 +03:00

omap2430.h

USB: musb: get rid of omap_readl/writel

2010-03-02 14:54:38 -08:00

tusb6010_omap.c

ARM: OMAP1: Make plat/mux.h omap1 only

2012-09-20 14:54:57 -07:00

tusb6010.c

usb: musb: tusb6010: fix error path in tusb_probe()

2012-09-06 19:52:27 +03:00

tusb6010.h

USB: musb: Remove my email address from few musb related drivers

2009-04-23 14:15:27 -07:00

ux500_dma.c

ARM: nomadik: move platform_data definitions

2012-09-14 11:19:00 +02:00

ux500.c

usb: phy: fix return value check of usb_get_phy

2012-07-02 10:40:49 +03:00