diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 20:50:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 20:50:17 +0200 |
| commit | 9c5891bd4342349a200676d33f742dd1b864822c (patch) | |
| tree | b14c1698f2d8ce5276e1befd562f6398a46b48b9 /drivers/hid/hid-hyperv.c | |
| parent | pcmcia: synclink_cs: replace sum of bitmasks with OR operation. (diff) | |
| parent | Linux 3.11-rc3 (diff) | |
| download | linux-9c5891bd4342349a200676d33f742dd1b864822c.tar.xz linux-9c5891bd4342349a200676d33f742dd1b864822c.zip | |
Merge 3.11-rc3 into char-misc-next.
This resolves a merge issue with:
drivers/misc/mei/init.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/hid-hyperv.c')
0 files changed, 0 insertions, 0 deletions