]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
authorKevin Hilman <khilman@linaro.org>
Fri, 18 Oct 2013 14:57:17 +0000 (07:57 -0700)
committerKevin Hilman <khilman@linaro.org>
Fri, 18 Oct 2013 14:57:17 +0000 (07:57 -0700)
From Nicolas Ferre:
First cleanup series for 3.13
- a little non-urgent fix
- addition of DT files to MAINTAINERS
- more important, the splitting of .dtsi files
  that allows to precisely choose the peripherals
  that are present for a particular SoC.
  It is useful for upcoming move to common cloks.

* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
  MAINTAINERS: Add patterns for DTS files for AT91
  ARM: at91: remove init_machine() as default is suitable
  ARM: at91/dt: split sama5d3 peripheral definitions
  ARM: at91/dt: split sam9x5 peripheral definitions
  ARM: at91: cam60: fix incorrect placement of __initdata tag

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index b95ebade6c02cf6172d6561487736f2b914492ec,26dcb991a61460c2ab7d32e63e53882105ad660e..ab80e34d88c79e10592e253843667cf9388de74c
@@@ -763,6 -763,10 +763,10 @@@ W:       http://maxim.org.za/at91_26.htm
  W:    http://www.linux4sam.org
  S:    Supported
  F:    arch/arm/mach-at91/
+ F:    arch/arm/boot/dts/at91*.dts
+ F:    arch/arm/boot/dts/at91*.dtsi
+ F:    arch/arm/boot/dts/sama*.dts
+ F:    arch/arm/boot/dts/sama*.dtsi
  
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <rob.herring@calxeda.com>
@@@ -1142,6 -1146,11 +1146,6 @@@ F:     drivers/net/ethernet/i825xx/ether1
  F:    drivers/net/ethernet/seeq/ether3*
  F:    drivers/scsi/arm/
  
 -ARM/SHARK MACHINE SUPPORT
 -M:    Alexander Schulz <alex@shark-linux.de>
 -W:    http://www.shark-linux.de/shark.html
 -S:    Maintained
 -
  ARM/SAMSUNG ARM ARCHITECTURES
  M:    Ben Dooks <ben-linux@fluff.org>
  M:    Kukjin Kim <kgene.kim@samsung.com>