]> 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>
Mon, 6 Jan 2014 08:13:42 +0000 (19:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 08:13:42 +0000 (19:13 +1100)
commitf7efd691d6b79750d6be56fe777273b33ecded5a
tree3f7eb1f28a5ca9cf8fd53174f39dbf92e334f9c8
parentdc236d2d052241ea72da8e62ae277a46394ec2c7
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