projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b7daad 5e5e3a4)
Merge branch 'topic/suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:06:18 +0000 (11:06 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:06:18 +0000 (11:06 +0000)
Conflicts:
drivers/regulator/sky81452-regulator.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.