]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'target-updates/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 05:41:52 +0000 (16:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 05:41:52 +0000 (16:41 +1100)
commit8b585c55ed42081946066757f2928874dc41dfab
treedeca64ff06c9533cae37b96f5f938dd080fc1cae
parent675b49d6a93dbe327a77f50976e7a9edaa0eb4e3
parentd79dc4525ad557f34e322d4c8f9d9de1b8fc9048
Merge remote-tracking branch 'target-updates/for-next'

Conflicts:
drivers/target/target_core_tpg.c
drivers/target/target_core_device.c
drivers/target/target_core_iblock.c
drivers/target/target_core_tpg.c
include/target/target_core_base.h