diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 16:54:15 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 16:54:15 +0200 |
commit | 48b9bf0953867d4fb21f44d8c1a061b5358fe53b (patch) | |
tree | f57f0c0751b4d7476398fbe07a79bf4ef3bdd09d /arch/arm/mach-orion5x/Makefile | |
parent | Merge branch 'clps711x/cleanup' into next/cleanup (diff) | |
parent | Dove: Fix Section mismatch warnings (diff) | |
download | linux-48b9bf0953867d4fb21f44d8c1a061b5358fe53b.tar.xz linux-48b9bf0953867d4fb21f44d8c1a061b5358fe53b.zip |
Merge branch 'marvell_cleanup_for_v3.5' of git://git.infradead.org/users/jcooper/linux into next/cleanup
* 'marvell_cleanup_for_v3.5' of git://git.infradead.org/users/jcooper/linux:
Dove: Fix Section mismatch warnings
ARM: orion5x: ts78xx debugging changes
ARM: orion5x: remove PM dependency from ts78xx
ARM: orion5x: ts78xx fix NAND resource off by one
ARM: orion5x: ts78xx whitespace cleanups
Orion5x: Fix Section mismatch warnings
Orion5x: Fix warning: struct pci_dev declared inside paramter list
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-orion5x/Makefile')
0 files changed, 0 insertions, 0 deletions