Merge tag 'armsoc/for-3.15/cleanup' of git://github.com/broadcom/mach-bcm into next...
authorOlof Johansson <olof@lixom.net>
Tue, 11 Mar 2014 20:27:04 +0000 (13:27 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 11 Mar 2014 20:27:21 +0000 (13:27 -0700)
Merge "ARM: mach-bcm: cleanups for 3.15" from Matt Porter:

- make bcm281xx symbol naming consistent with SoC name
- remove unneeded and reorder bcm281xx header files
- consolidate bcm281xx reboot and l2 cache code

* tag 'armsoc/for-3.15/cleanup' of git://github.com/broadcom/mach-bcm:
  ARM: bcm281xx: Rename board_init() function
  ARM: bcm281xx: Re-order hearder files
  ARM: bcm281xx: Consolidate reboot code
  ARM: bcm281xx: Move kona_l2_cache_init() so it can be shared
  ARM: bcm281xx: symbol cleanup

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge