David S. Miller 8b3f6af863 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/cpc-usb/TODO
	drivers/staging/cpc-usb/cpc-usb_drv.c
	drivers/staging/cpc-usb/cpc.h
	drivers/staging/cpc-usb/cpc_int.h
	drivers/staging/cpc-usb/cpcusb.h

2009-09-24 15:13:11 -07:00

..

include/mach

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-09-24 15:13:11 -07:00

at91cap9_devices.c

[ARM] 5390/1: AT91: Watchdog fixes

2009-02-14 16:01:57 +00:00

at91cap9.c

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

at91rm9200_devices.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

at91rm9200_time.c

clocksource: pass clocksource to read() callback

2009-04-21 13:41:47 -07:00

at91rm9200.c

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

at91sam9g45_devices.c

[ARM] 5572/1: at91: Support for at91sam9g45 series: core chip & board support

2009-06-27 11:05:22 +01:00

at91sam9g45.c

[ARM] 5572/1: at91: Support for at91sam9g45 series: core chip & board support

2009-06-27 11:05:22 +01:00

at91sam9rl_devices.c

[ARM] 5390/1: AT91: Watchdog fixes

2009-02-14 16:01:57 +00:00

at91sam9rl.c

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

at91sam926x_time.c

clocksource: pass clocksource to read() callback

2009-04-21 13:41:47 -07:00

at91sam9260_devices.c

AT91: atmel-mci: Platform configuration to the the atmel-mci driver

2009-09-23 07:39:37 -07:00

at91sam9260.c

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

at91sam9261_devices.c

[ARM] 5390/1: AT91: Watchdog fixes

2009-02-14 16:01:57 +00:00

at91sam9261.c

[ARM] 5570/1: at91: Support for at91sam9g10: core chip & board support

2009-07-02 15:59:56 +01:00

at91sam9263_devices.c

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-09-24 15:13:11 -07:00

at91sam9263.c

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

at91x40_time.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

at91x40.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

board-1arm.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

board-afeb-9260v1.c

trivial: fix typos in comments s/DGBU/DBGU/

2009-09-21 15:14:55 +02:00

board-cam60.c

trivial: fix typos in comments s/DGBU/DBGU/

2009-09-21 15:14:55 +02:00

board-cap9adk.c

[ARM] 5319/1: AT91: support AT91CAP9 revC CPUs

2008-12-01 17:22:07 +00:00

board-carmeva.c

[ARM] 5261/1: [AT91] Support for LEDs on Conitec ARM&EVA board

2008-09-29 15:46:03 +01:00

board-cpu9krea.c

ARM: 5629/1: Add support for Eukrea's CPU9260 & CPU9G20

2009-07-30 17:48:40 +01:00

board-cpuat91.c

ARM: 5630/1: Add support for Eukrea's CPUAT91

2009-07-30 17:48:41 +01:00

board-csb337.c

[ARM] 5263/2: [AT91] GPIO buttons as wakeup sources

2008-09-21 23:01:00 +01:00

board-csb637.c

[ARM] 5257/2: [AT91] Use SZ_ definitions and MTDPART_OFS_NXTBLK instead of hex-values

2008-09-21 22:58:36 +01:00

board-dk.c

[ARM] 5257/2: [AT91] Use SZ_ definitions and MTDPART_OFS_NXTBLK instead of hex-values

2008-09-21 22:58:36 +01:00

board-eb01.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

board-eb9200.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

board-ecbat91.c

[ARM] 5257/2: [AT91] Use SZ_ definitions and MTDPART_OFS_NXTBLK instead of hex-values

2008-09-21 22:58:36 +01:00

board-ek.c

[ARM] 5257/2: [AT91] Use SZ_ definitions and MTDPART_OFS_NXTBLK instead of hex-values

2008-09-21 22:58:36 +01:00

board-kafa.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

board-kb9202.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

board-neocore926.c

trivial: fix typos in comments s/DGBU/DBGU/

2009-09-21 15:14:55 +02:00

board-picotux200.c

[ARM] 5257/2: [AT91] Use SZ_ definitions and MTDPART_OFS_NXTBLK instead of hex-values

2008-09-21 22:58:36 +01:00

board-qil-a9260.c

trivial: fix typos in comments s/DGBU/DBGU/

2009-09-21 15:14:55 +02:00

board-sam9-l9260.c

[ARM] 5289/1: [AT91] Convert boards to use sam9_smc_configure()

2008-12-01 17:18:13 +00:00

board-sam9g20ek-2slot-mmc.c

AT91: atmel-mci: Platform configuration to the the atmel-mci driver

2009-09-23 07:39:37 -07:00

board-sam9g20ek.c

trivial: fix typos in comments s/DGBU/DBGU/

2009-09-21 15:14:55 +02:00

board-sam9m10g45ek.c

[ARM] 5572/1: at91: Support for at91sam9g45 series: core chip & board support

2009-06-27 11:05:22 +01:00

board-sam9rlek.c

trivial: fix typos in comments s/DGBU/DBGU/

2009-09-21 15:14:55 +02:00

board-sam9260ek.c

trivial: fix typos in comments s/DGBU/DBGU/

2009-09-21 15:14:55 +02:00

board-sam9261ek.c

trivial: fix typos in comments s/DGBU/DBGU/

2009-09-21 15:14:55 +02:00

board-sam9263ek.c

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-09-24 15:13:11 -07:00

board-usb-a9260.c

trivial: fix typos in comments s/DGBU/DBGU/

2009-09-21 15:14:55 +02:00

board-usb-a9263.c

trivial: fix typos in comments s/DGBU/DBGU/

2009-09-21 15:14:55 +02:00

board-yl-9200.c

[ARM] 5257/2: [AT91] Use SZ_ definitions and MTDPART_OFS_NXTBLK instead of hex-values

2008-09-21 22:58:36 +01:00

clock.c

[ARM] 5567/1: at91: Support for at91sam9g10: clocks management

2009-07-02 15:59:54 +01:00

clock.h

[ARM] 4124/1: Rename mach-at91rm9200 and arch-at91rm9200 directories

2007-02-08 14:50:56 +00:00

generic.h

[ARM] 5572/1: at91: Support for at91sam9g45 series: core chip & board support

2009-06-27 11:05:22 +01:00

gpio.c

[ARM] 5566/1: Remove at91_gpiolib_request

2009-06-27 11:03:47 +01:00

irq.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

Kconfig

AT91: atmel-mci: Platform configuration to the the atmel-mci driver

2009-09-23 07:39:37 -07:00

leds.c

[ARM] 5267/1: [AT91] Name conflict in mach-at91/leds.c

2008-09-29 15:46:26 +01:00

Makefile

AT91: atmel-mci: Platform configuration to the the atmel-mci driver

2009-09-23 07:39:37 -07:00

Makefile.boot

[ARM] 5572/1: at91: Support for at91sam9g45 series: core chip & board support

2009-06-27 11:05:22 +01:00

pm_slowclock.S

[ARM] 5264/2: [AT91] Suspend-to-RAM disables main oscillator

2008-09-21 23:01:01 +01:00

pm.c

[ARM] 5570/1: at91: Support for at91sam9g10: core chip & board support

2009-07-02 15:59:56 +01:00

sam9_smc.c

[ARM] 5287/2: [AT91] Configuration of Static Memory Controller

2008-12-01 17:18:08 +00:00

sam9_smc.h

[ARM] 5287/2: [AT91] Configuration of Static Memory Controller

2008-12-01 17:18:08 +00:00