diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 20:08:43 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 12:06:28 +0200 |
| commit | f5f29151588744ea2e283971cb0ad403ee04e3e2 (patch) | |
| tree | afdeceebd1e5413508d35fded1dd3363e931071f /drivers/net/wireless/iwlwifi/iwl-drv.c | |
| parent | 806a94f20c8d78c96601878393a49fab577dcf2e (diff) | |
| parent | f1ac922dec7ed36659344eadc65b9c06efe14d7f (diff) | |
Merge tag 'bcm2835-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/multiplatform
From Stephen Warren <swarren@wwwdotorg.org>:
ARM: bcm2835: convert to multi-platform
This branch (patch) converts BCM2835 to support being built into a
multi-platform single zImage. This mostly entails a few small Kconfig
tweaks, move the earlyprintk implementation to the standard multi-
platform location, and deleting some unnecessary files.
* tag 'bcm2835-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
ARM: bcm2835: convert to multi-platform
Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig.debug
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-drv.c')
0 files changed, 0 insertions, 0 deletions