summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-07-26 11:58:35 +0200
committerArnd Bergmann <arnd@arndb.de>2014-07-26 11:59:20 +0200
commitf169f4007e46c41adadcb34ce248a39f543aaac0 (patch)
tree0ad90064a1166b2f2a609f66ec9241f021d2e795 /drivers
parent0081b77d98317092d2292ff0f8e33c97c1f5d918 (diff)
parent9a3c4145af32125c5ee39c0272662b47307a8323 (diff)
parentfce9e5bb25264153f9f002eada41757118d25ba9 (diff)
parentf86e0add813a3cc0e338089fa6c0928f5f6dc52d (diff)
downloadop-kernel-dev-f169f4007e46c41adadcb34ce248a39f543aaac0.zip
op-kernel-dev-f169f4007e46c41adadcb34ce248a39f543aaac0.tar.gz
Merge branches 'samsung/cleanup' and 'samsung/s5p-cleanup-v2', tag 'v3.16-rc6' into next/soc
The following samsung branches are based on these cleanups, which are already in mainline before this branch gets pulled. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
OpenPOWER on IntegriCloud