]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d3b2c9f b9b0a50)
Merge branch 'next/fixes-non-critical' into for-next
authorOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 05:40:36 +0000 (22:40 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 05:40:36 +0000 (22:40 -0700)
commit1a3058628a2766c6bc6c648d0fc03cfbb760e10b
tree4fd91b03df4047b13429cc05bba2c29ce3a46b13tree | snapshot
parentd3b2c9fec0176f934747cdfd17339fba251f39a5commit | diff
parentb9b0a506be3e09278d002eeb727430f22463f55ecommit | diff
Merge branch 'next/fixes-non-critical' into for-next

* next/fixes-non-critical:
  ARM: ux500: Provide SMSC911x fixed-regulator when not booting DT
  ARM: ux500: Fix build error due to missing include of asm/pmu.h in cpu-db8500.c
  ARM: ux500: set proper GIC flags

Fixed up trivial conflict in arch/arm/mach-ux500/cpu.c
arch/arm/arm-soc-for-next-contents.txt diff1 | | blob | history
arch/arm/mach-ux500/cpu-db8500.c diff1 | diff2 | blob | history
arch/arm/mach-ux500/cpu.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules