diff options
| author | Olof Johansson <olof@lixom.net> | 2015-02-06 10:58:29 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-02-06 10:58:29 +0300 |
| commit | df1a66812535e04bfd960e15d5be4893853b6730 (patch) | |
| tree | b7ac004b02ebfb95c66025af20faab3d3fa90124 /fs/lockd/xdr.c | |
| parent | ee481c84fa0675c94fd4443f6da5be836664d821 (diff) | |
| parent | ad3fc3e316891cbc4f33116a61c57c4a9b2a2518 (diff) | |
| download | linux-df1a66812535e04bfd960e15d5be4893853b6730.tar.xz | |
Merge tag 'at91-soc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/soc
Merge "at91: cleanup/soc for 3.20 #4" from Nicolas Ferre:
Fourth cleanup/soc batch for 3.20:
- merge all the at91sam9 code and remove the empty SoC-specific files
- remove the at91_boot_soc that is now useless in a DT context
- move the sram code in PM code as it's now only used there
- some file + function name changes after this big cleanup
* tag 'at91-soc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91/trivial: unify functions and machine names
ARM: at91: remove at91_dt_initialize and machine init_early()
ARM: at91: change board files into SoC files
ARM: at91: remove at91_boot_soc
ARM: at91: move alternative initial mapping to board-dt-sama5.c
ARM: at91: merge all SOC_AT91SAM9xxx
ARM: at91: at91rm9200: set idle and restart from rm9200_dt_device_init()
ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree
ARM: at91/dt: sam9263: Add missing clocks to lcdc node
ARM: at91: sama5d3: dt: correct the sound route
ARM: at91/dt: sama5d4: fix the timer reg length
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/lockd/xdr.c')
0 files changed, 0 insertions, 0 deletions