lkml.org 
[lkml]   [2011]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the staging tree with the hid tree
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/hid/hid-hyperv.c between commit b95f5bcb811e ("HID: Move the
hid-hyperv driver out of staging") from the hid tree and various commits
from the staging tree (this was drivers/staging/hv/hv_mouse.c).

The commit message says that all the changes that happened when this file
moved from staging have also been applied to the staging file, so I just
used the version from the hid tree.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-12-01 04:43    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site