diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 11:25:34 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 11:25:34 -0400 |
| commit | 6fbfd0592ef88ba29cdce84ef92757351f1fa9c9 (patch) | |
| tree | 7c0af4bcc08f3ad7befb93d73d9729f82252c950 /scripts/conmakehash.c | |
| parent | f2c32a882d2c1cde6fc552a5a3d34b4c1330edb8 (diff) | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
Merge v3.5-rc5 into driver-core-next
This picks up the big printk fixes, and resolves a merge issue with:
drivers/extcon/extcon_gpio.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/conmakehash.c')
0 files changed, 0 insertions, 0 deletions