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

..

act200l-sir.c

drivers/net/*/: Use static const

2010-12-21 02:16:10 -08:00

actisys-sir.c

…

ali-ircc.c

drivers: net: Remove casts to same type

2012-06-06 09:31:33 -07:00

ali-ircc.h

…

au1k_ir.c

drivers: net: Remove casts to same type

2012-06-06 09:31:33 -07:00

bfin_sir.c

drivers: net: irda: bfin_sir: fix compile error

2012-08-08 15:40:25 -07:00

bfin_sir.h

net/irda: convert bfin_sir to common Blackfin UART header

2011-05-24 01:13:11 -04:00

donauboe.c

donauboe: replace excessive udelay with msleep

2012-04-21 15:28:47 -04:00

donauboe.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

ep7211-sir.c

…

esi-sir.c

…

girbil-sir.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

irda-usb.c

USB: irda-usb.c: remove err() usage

2012-04-25 14:48:49 -07:00

irda-usb.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

irtty-sir.c

tty: move the termios object into the tty

2012-07-16 13:00:41 -07:00

irtty-sir.h

…

Kconfig

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-05-22 19:22:50 -07:00

kingsun-sir.c

USB: kingsun-sir.c: remove err() usage

2012-04-25 14:48:50 -07:00

ks959-sir.c

drivers/net/irda: fix error return code

2012-08-20 02:33:21 -07:00

ksdazzle-sir.c

drivers/net/irda: fix error return code

2012-08-20 02:33:21 -07:00

litelink-sir.c

…

ma600-sir.c

…

Makefile

net/irda: Add SuperH IrDA driver support

2010-04-06 19:50:21 -07:00

mcp2120-sir.c

…

mcs7780.c

USB: convert drivers/net/* to use module_usb_driver()

2011-11-18 09:44:20 -08:00

mcs7780.h

…

nsc-ircc.c

treewide: Fix typos in various parts of the kernel, and fix some comments.

2011-12-02 14:57:31 +01:00

nsc-ircc.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

old_belkin-sir.c

…

pxaficp_ir.c

Merge branch 'multiplatform/platform-data' into next/multiplatform

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

sa1100_ir.c

ARM: sa11x0: fix build errors from DMA engine API updates

2012-03-30 11:46:20 +01:00

sh_irda.c

net: Fix spelling typo in net

2012-04-14 15:29:02 -04:00

sh_sir.c

net: Fix spelling typo in net

2012-04-14 15:29:02 -04:00

sir_dev.c

net: remove interrupt.h inclusion from netdevice.h

2011-06-06 22:55:11 -07:00

sir_dongle.c

…

sir-dev.h

…

smsc-ircc2.c

NET: smsc-ircc2: mark non-experimental

2012-04-27 00:03:35 -04:00

smsc-ircc2.h

…

smsc-sio.h

…

stir4200.c

USB: stir4200.c: remove err() usage

2012-04-25 14:48:51 -07:00

tekram-sir.c

…

toim3232-sir.c

treewide: transciever/transceiver spelling fixes

2011-06-24 11:20:14 +02:00

via-ircc.c

drivers/net/irda/{ali-ircc, via-ircc, w83977af-ir}.c: ensure arguments to request_irq and free_irq are compatible

2012-03-11 15:41:18 -07:00

via-ircc.h

drivers/net: Remove unnecessary semicolons

2011-06-05 14:33:40 -07:00

vlsi_ir.c

net: remove interrupt.h inclusion from netdevice.h

2011-06-06 22:55:11 -07:00

vlsi_ir.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

w83977af_ir.c

drivers/net/irda/{ali-ircc, via-ircc, w83977af-ir}.c: ensure arguments to request_irq and free_irq are compatible

2012-03-11 15:41:18 -07:00

w83977af_ir.h

…

w83977af.h

…