| commit | 7da59d2fe30d8169c7c9e7b488beb1b9af932608 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Aug 27 09:09:07 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Aug 27 09:09:07 2012 -0700 |
| tree | 02438ff9c258cf80d3a3955215fbcff7bd7e392e | |
| parent | fea7a08acb13524b47711625eebea40a0ede69a0 [diff] | |
| parent | 877cdf3949cc67d00677a1dfb913001f324ac40d [diff] |
Merge v3.6-rc3 into 'char-misc-next' This resolves a conflict in: drivers/misc/mei/interrupt.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>