| commit | 7068cb07563d8f001e83a2836ccf1cef6518aea4 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Jun 19 20:26:43 2013 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Jun 19 20:26:43 2013 -0700 |
| tree | 1b708c157ec11f8be7f72b1db3ae3b2f903a760d | |
| parent | bb07b00be77fb33274cb44a03bdbf2471e556189 [diff] | |
| parent | 875979368eb4cfecff9f0e97625b90cc6009269d [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>