]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2fafa34 3f31528)
Merge branch 'driver-core-linus' into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 Jun 2013 03:26:43 +0000 (20:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 Jun 2013 03:26:43 +0000 (20:26 -0700)
commit69cc39ace8c4ab7047b2d8ab4dbf38a0d1b5d15a
tree1b708c157ec11f8be7f72b1db3ae3b2f903a760dtree | snapshot
parent2fafa34747f39c18ed0e9e31f3022e22bb02e44bcommit | diff
parent3f31528aca905d7e063dd66321a78e620cafbc55commit | diff
Merge branch 'driver-core-linus' into driver-core-next

This resolves the merge issues with drivers/base/firmware_class.c

Thanks to Ming Lei for the patch and hints on how to resolve it.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/firmware_class.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.