diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-30 09:58:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-30 09:58:36 -0800 |
| commit | 4fe2dfabe48edb799065d05fe96bfb7745cd5688 (patch) | |
| tree | a257d72db9d39616376633fe0d410fc8c1f4ef7b /arch/arm/mach-omap2/board-apollon.c | |
| parent | ecccd1248d6e6986130ffcc3b0d003cb46a485c0 (diff) | |
| parent | 2e376799b2f6af2e8baeb407b6437a4d7b650ac0 (diff) | |
Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"It's been quiet over the holidays, but we have had a couple of trivial
fixes coming in for the newly introduced sunxi platform; one to add it
to the multiplatform defconfig for build coverage, and one fixup for
device tree strings."
* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
sunxi: Change the machine compatible string.
ARM: multi_v7_defconfig: Add ARCH_SUNXI
Diffstat (limited to 'arch/arm/mach-omap2/board-apollon.c')
0 files changed, 0 insertions, 0 deletions