diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 17:41:39 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 17:41:39 (GMT) |
commit | 6a445c7fa739d2cde881a22f1ed38455eeb56f51 (patch) | |
tree | f9370a068410da060d825b68d099f7f64af16981 /arch/x86/kernel/cpu/mtrr/cleanup.c | |
parent | f737c7705ff0df2f1d66e14ec30a1a5f285ddb39 (diff) | |
parent | 47e1993d32d4e0f9524c2147576468fe11e87b5f (diff) | |
download | linux-fsl-qoriq-6a445c7fa739d2cde881a22f1ed38455eeb56f51.tar.xz |
Merge tag 'devel-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull late-merged development and first fixes for arm-soc from Olof Johansson:
"This branch contains a few development patches for Samsung and
Versatile Express that were submitted to arm-soc near the beginning of
the merge window. We picked them up with the agreement that they
would need to sit in linux-next for a while, and now they have.
There are also two fixes:
- One long-standing build breakage on ixp4xx due to missing gpiolib
dependencies.
- The other is for some gpio device tree changes needed on lpc32xx."
* tag 'devel-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: LPC32xx: Adjust dts files to gpio dt binding
ixp4xx: fix compilation by adding gpiolib support
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
ARM: EXYNOS: Support suspend and resume for EXYNOS5250
ARM: EXYNOS: Add Clock register list for save and restore
ARM: EXYNOS: Add PMU table for EXYNOS5250
ARM: EXYNOS: Rename of function for pm.c
ARM: EXYNOS: Remove GIC save & restore function
ARM: dts: Add node for interrupt combiner controller on EXYNOS5250
ARM: S3C24XX: add support for second irq set of S3C2416
ARM: S3C64XX: use timekeeping wrapper on cpuidle
ARM: S3C64XX: declare the states with the new api on cpuidle
ARM: S3C64XX: Hook up carrier class modules on Cragganmore
ARM: S3C64XX: Initial hookup for Bells module on Cragganmore
Diffstat (limited to 'arch/x86/kernel/cpu/mtrr/cleanup.c')
0 files changed, 0 insertions, 0 deletions