summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 14:24:41 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 14:24:41 +0100
commitccfa8b21f20099b950b4f2f75d2330fb149a2012 (patch)
tree60380e1417830f50683c3945e2fb9ee110418cbb /virt
parent7e0cac630c7c90f12a78131df9913657fa30243b (diff)
parentf350b86121c7a004a5f866333fa1d23fe30263a6 (diff)
downloadop-kernel-dev-ccfa8b21f20099b950b4f2f75d2330fb149a2012.zip
op-kernel-dev-ccfa8b21f20099b950b4f2f75d2330fb149a2012.tar.gz
Merge branch 'cross-platform/debug_ll' into imx/imx6q
Conflicts: arch/arm/Kconfig.debug
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud