On Fri, Apr 30, 2010 at 03:51:15PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/input/tablet/kbtab.c between commits
> ee7aa6ce41e08c68f72b5ca8f14fb61286dc2418 ("Input: kbtab - fix incorrect
> size parameter in usb_buffer_free") and
> 331cb022d3ac1f85f7842a51495c33c629e947bc ("Input: kbtab - simplify
> kbtab_disconnect()") from the input tree and commit
> 3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename usb_buffer_alloc()
> and usb_buffer_free() users") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
thanks for the fix.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
