diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 02:28:55 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 02:29:10 +0400 |
| commit | c40f01287b3369638c9cb145298a79cc7103f696 (patch) | |
| tree | 65568873d4d71c04882aafd880947c3302a3c08f /net/caif | |
| parent | 28d1079c9cc7dd37ce9397d559b5ceef8a66b1db (diff) | |
| parent | eeda4cb92ee0fb63a5917738e107b0bc8168079e (diff) | |
| download | linux-c40f01287b3369638c9cb145298a79cc7103f696.tar.xz | |
Merge tag 'for-3.16/bcm-cleanup' of git://github.com/broadcom/mach-bcm into next/cleanup
* Clean up mach-bcm config and build targets
* Clean up bcm281xx/21664 SMC code
* Clean up bcm281xx/21664 L2C code
* tag 'for-3.16/bcm-cleanup' of git://github.com/broadcom/mach-bcm:
ARM: bcm: rename "kona.h" and "kona.c"
ARM: bcm: rewrite commentary for bcm_kona_do_smc()
ARM: bcm: use inline assembly for "smc" request
ARM: bcm: tidy up a few includes
ARM: bcm: config option for l2 cache support
ARM: bcm: don't special-case CPU 0 in bcm_kona_smc()
ARM: bcm: have bcm_kona_smc() return request result
ARM: bcm: clean up SMC code
ARM: bcm: err, don't BUG() on SMC init failures
ARM: bcm: use memory accessors for ioremapped area
ARM: bcm: clean up config and build targets
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
arch/arm/mach-bcm/Kconfig
Diffstat (limited to 'net/caif')
0 files changed, 0 insertions, 0 deletions