Merge branch 'marvell_cleanup_for_v3.5' of git://git.infradead.org/users/jcooper...
authorArnd Bergmann <arnd@arndb.de>
Tue, 15 May 2012 14:54:15 +0000 (16:54 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 15 May 2012 14:54:15 +0000 (16:54 +0200)
* '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>

Trivial merge