]> 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>
Wed, 8 Jan 2014 04:04:44 +0000 (15:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 04:04:44 +0000 (15:04 +1100)
commit67378a36ea40be8e38f4e52f85a147bed77ee279
tree4bb38e504b6efad43cf8bafbecf7b1f4804c22e5
parentcc347be256672f9bb651af6253d0f2e220d3a640
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