diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-07-01 10:36:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-07-01 10:36:20 +0200 |
| commit | cb5cb5b32ea035557a03e599a1fc9ea6b74d96d8 (patch) | |
| tree | c463386d1dec6bd87c2656f0a235d486643451a7 /drivers/net/can/sja1000/pipcan.c | |
| parent | 6e98697852ec5ff16fb64bf045e51b3c537aafb9 (diff) | |
| parent | 1a7fac5b90544559433af901632d8fcd103a2fd9 (diff) | |
| download | linux-2.6-cb5cb5b32ea035557a03e599a1fc9ea6b74d96d8.tar.gz linux-2.6-cb5cb5b32ea035557a03e599a1fc9ea6b74d96d8.tar.xz | |
Merge branch 'phytec-master-new' into tmp2
Conflicts:
arch/arm/Kconfig
arch/arm/mach-mx2/Kconfig
arch/arm/mach-mx2/Makefile
arch/arm/mach-mx2/clock_imx27.c
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
arch/arm/mach-mx2/pca100.c
arch/arm/mach-mx2/pcm038.c
arch/arm/mach-mx2/pcm970-baseboard.c
arch/arm/mach-mx3/Kconfig
arch/arm/mach-mx3/Makefile
arch/arm/mach-mx3/devices.c
arch/arm/mach-mx3/devices.h
arch/arm/mach-mx3/mx31moboard.c
arch/arm/mach-mx3/pcm037.c
arch/arm/mach-mx3/pcm043.c
arch/arm/plat-mxc/Kconfig
arch/arm/plat-mxc/include/mach/debug-macro.S
drivers/mfd/mc13783-core.c
drivers/net/Kconfig
drivers/net/can/Kconfig
drivers/net/can/Makefile
drivers/net/can/dev.c
drivers/net/can/mcp251x.c
drivers/net/can/sja1000/Makefile
drivers/net/can/sja1000/ems_pci.c
drivers/net/can/sja1000/kvaser_pci.c
drivers/net/can/sja1000/sja1000.c
drivers/net/can/sja1000/sja1000.h
drivers/net/can/sja1000/sja1000_platform.c
drivers/regulator/Kconfig
drivers/usb/gadget/fsl_udc_core.c
drivers/video/imxfb.c
drivers/watchdog/Makefile
include/linux/can/dev.h
sound/arm/imx2-pcm.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/can/sja1000/pipcan.c')
0 files changed, 0 insertions, 0 deletions