leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
92cd3a17ce
linux/arch/arm/mach-at91
History
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
include/mach mmc: at91_mci: move register header from include/ to drivers/ 2011-07-21 10:35:08 -04:00
at91cap9_devices.c at91: fix at91_set_serial_console: use platform device id 2011-06-25 13:34:11 +08:00
at91cap9.c at91: Use "pclk" as con_id on at91cap9 and at91rm9200 2011-06-25 14:37:28 +08:00
at91rm9200_devices.c at91: fix at91_set_serial_console: use platform device id 2011-06-25 13:34:11 +08:00
at91rm9200_time.c ARM: AT91: update clock source registration 2010-12-19 15:44:53 +00:00
at91rm9200.c at91: Use "pclk" as con_id on at91cap9 and at91rm9200 2011-06-25 14:37:28 +08:00
at91sam9_alt_reset.S AT91: reset routine cleanup, remove not needed icache flush 2010-10-26 11:32:48 +02:00
at91sam9g45_devices.c at91: fix at91_set_serial_console: use platform device id 2011-06-25 13:34:11 +08:00
at91sam9g45.c at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl 2011-06-25 13:34:40 +08:00
at91sam9rl_devices.c at91: fix at91_set_serial_console: use platform device id 2011-06-25 13:34:11 +08:00
at91sam9rl.c at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl 2011-06-25 13:34:40 +08:00
at91sam926x_time.c ARM: AT91: update clock source registration 2010-12-19 15:44:53 +00:00
at91sam9260_devices.c at91: fix at91_set_serial_console: use platform device id 2011-06-25 13:34:11 +08:00
at91sam9260.c at91: switch to CLKDEV_LOOKUP 2011-05-25 23:04:34 +08:00
at91sam9261_devices.c Merge branch 'master' into for-next 2011-07-11 14:15:55 +02:00
at91sam9261.c at91: switch to CLKDEV_LOOKUP 2011-05-25 23:04:34 +08:00
at91sam9263_devices.c at91: fix at91_set_serial_console: use platform device id 2011-06-25 13:34:11 +08:00
at91sam9263.c at91: switch to CLKDEV_LOOKUP 2011-05-25 23:04:34 +08:00
at91x40_time.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
at91x40.c at91: switch to CLKDEV_LOOKUP 2011-05-25 23:04:34 +08:00
board-1arm.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-afeb-9260v1.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-cam60.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-cap9adk.c AT91: Change nand buswidth logic to match hardware default configuration 2011-07-04 23:22:25 +02:00
board-carmeva.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-cpu9krea.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-cpuat91.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-csb337.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-csb637.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-eb01.c at91: fix map_io init usage 2011-05-25 23:04:34 +08:00
board-eb9200.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-ecbat91.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-eco920.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-flexibity.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-foxg20.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-gsia18s.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-kafa.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-kb9202.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-neocore926.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-pcontrol-g20.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-picotux200.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-qil-a9260.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-rm9200dk.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-rm9200ek.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
board-sam9-l9260.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-sam9g20ek.c AT91: Change nand buswidth logic to match hardware default configuration 2011-07-04 23:22:25 +02:00
board-sam9m10g45ek.c AT91: Change nand buswidth logic to match hardware default configuration 2011-07-04 23:22:25 +02:00
board-sam9rlek.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-sam9260ek.c AT91: Change nand buswidth logic to match hardware default configuration 2011-07-04 23:22:25 +02:00
board-sam9261ek.c AT91: Change nand buswidth logic to match hardware default configuration 2011-07-04 23:22:25 +02:00
board-sam9263ek.c AT91: Change nand buswidth logic to match hardware default configuration 2011-07-04 23:22:25 +02:00
board-snapper9260.c Change Ryan Mallon's email address across the kernel 2011-06-16 11:22:05 +02:00
board-stamp9g20.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-usb-a9260.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-usb-a9263.c at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
board-yl-9200.c at91rm9200: introduce at91rm9200_set_type to specficy cpu package 2011-05-25 23:04:35 +08:00
clock.c at91: drop at572d940hf support 2011-05-25 23:04:35 +08:00
clock.h at91: switch to CLKDEV_LOOKUP 2011-05-25 23:04:34 +08:00
cpuidle.c ARM: 5778/1: AT91: Add cpuidle support 2009-11-10 23:46:35 +00:00
generic.h at91: drop at572d940hf support 2011-05-25 23:04:35 +08:00
gpio.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
Kconfig at91: drop at572d940hf support 2011-05-25 23:04:35 +08:00
leds.c [ARM] 5267/1: [AT91] Name conflict in mach-at91/leds.c 2008-09-29 15:46:26 +01:00
Makefile at91: drop at572d940hf support 2011-05-25 23:04:35 +08: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 AT91: pm: make sure that r0 is 0 when dealing with cache operations 2010-10-26 11:32:48 +02:00
pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
pm.h AT91: pm: make sure that r0 is 0 when dealing with cache operations 2010-10-26 11:32:48 +02: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