Merge tag 'cleanup_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux...
authorOlof Johansson <olof@lixom.net>
Tue, 29 Jan 2013 22:53:13 +0000 (14:53 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 29 Jan 2013 22:53:13 +0000 (14:53 -0800)
commit1576a31c61d41a0bb549a3aabd10f42c5e233de4
tree43cd8164937a8c5950c96d1d267c59b0739792f9
parent00f4c14d183fe78814de57ca651829603f8b1459
parent63a069739a5826ab4007da88b7ec71eb9909271c
Merge tag 'cleanup_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux into next/cleanup

From Jason Cooper:
cleanup for v3.9 round2
 - remove unneeded #includes for mach-dove
 - remove unneeded #includes and code for the nsa310

* tag 'cleanup_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux:
  ARM: dove: cleanup includes
  ARM: kirkwood: nsa310: cleanup includes and unneeded code
arch/arm/mach-dove/common.c