]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'driver-core/driver-core-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 05:19:21 +0000 (15:19 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 05:19:21 +0000 (15:19 +1000)
commiteb6e838f9e4270bea1ced1a67aba536a48d0feae
tree8fed66ebe483a620b6834b2c0ccb0df93234067c
parent0d12b66ad671f7d08db4961efab13f90d7282050
parentcda43576afa641d83ae268cb9795ae2a549d53d9
Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
drivers/iommu/exynos-iommu.c
drivers/crypto/nx/nx-842.c
include/linux/device.h
kernel/sysctl.c