diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-31 17:00:24 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-31 17:37:12 +0100 |
| commit | fc2f669e7d0ea9559cbdc229ff97f9fff5f8de4f (patch) | |
| tree | d8cd91c4ec187e70ae7318c041f3ba775d11af4b /arch/arm/nwfpe/fpmodule.h | |
| parent | 2bc75dbf14f8f3db56c1f546e65a90b5286614ad (diff) | |
| parent | 5234c34e4cd7695647ccc1cabb50c3e7720dd3fb (diff) | |
| download | kernel_replicant_linux-fc2f669e7d0ea9559cbdc229ff97f9fff5f8de4f.tar.gz kernel_replicant_linux-fc2f669e7d0ea9559cbdc229ff97f9fff5f8de4f.tar.bz2 kernel_replicant_linux-fc2f669e7d0ea9559cbdc229ff97f9fff5f8de4f.zip | |
Merge tag 'bcm2835-soc-next-2015-12-28' of http://github.com/anholt/linux into next/soc
Merge "BCM2835 SOC changes for 4.5" from Eric Anholt:
This pull request includes the bcm2835 changes for 4.5 targeting the
arm-soc next/soc branch.
* tag 'bcm2835-soc-next-2015-12-28' of http://github.com/anholt/linux:
ARM: bcm2835: Add Kconfig support for bcm2836
ARM: bcm2835: Add a compat string for bcm2836 machine probe
dt-bindings: Add root properties for Raspberry Pi 2
Conflicts:
arch/arm/mach-bcm/Kconfig
Diffstat (limited to 'arch/arm/nwfpe/fpmodule.h')
0 files changed, 0 insertions, 0 deletions