summaryrefslogtreecommitdiff
path: root/Documentation/misc-devices
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-27 20:09:07 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-27 20:09:07 +0400
commit7da59d2fe30d8169c7c9e7b488beb1b9af932608 (patch)
tree02438ff9c258cf80d3a3955215fbcff7bd7e392e /Documentation/misc-devices
parentfea7a08acb13524b47711625eebea40a0ede69a0 (diff)
parent877cdf3949cc67d00677a1dfb913001f324ac40d (diff)
downloadlinux-7da59d2fe30d8169c7c9e7b488beb1b9af932608.tar.xz
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>
Diffstat (limited to 'Documentation/misc-devices')
0 files changed, 0 insertions, 0 deletions