summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-30 21:58:36 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-30 21:58:36 +0400
commit4fe2dfabe48edb799065d05fe96bfb7745cd5688 (patch)
treea257d72db9d39616376633fe0d410fc8c1f4ef7b /drivers/power
parentecccd1248d6e6986130ffcc3b0d003cb46a485c0 (diff)
parent2e376799b2f6af2e8baeb407b6437a4d7b650ac0 (diff)
downloadlinux-4fe2dfabe48edb799065d05fe96bfb7745cd5688.tar.xz
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 'drivers/power')
0 files changed, 0 insertions, 0 deletions