linux-next: manual merge of the staging tree with the tip tree

From: Stephen Rothwell
Date: Thu Aug 13 2015 - 00:55:41 EST

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:


between commit:

5a447f09a8df ("staging: ozwpan: Fix hrtimer wreckage")

from the tip tree and commit:

a73e99cb67e7 ("staging: ozwpan: Remove from tree")

from the staging tree.

I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at