| commit | dc5a18941b4226846f0c5994e4f45bc685f7bcfe | |
| author | Greg Kroah-Hartman <gregkh@suse.de> | |
| Thu, 9 Jun 2011 20:49:02 +0000 (9 13:49 -0700) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Thu, 9 Jun 2011 20:49:02 +0000 (9 13:49 -0700) | ||
| tree | 8189cc7586fb875484bce2a7122f2152343904bb | treesnapshot (tar.gz zip) |
| parent | 461df4ded3a143f09f9d0e870e7b16b787dc0591 | commitdiff |
| parent | c773298788598a26e325bc2639877c76818943e3 | commitdiff |
Merge Linus's tree into staging-next
This was done to resolve the conflicts that were in a number of files
due to changes done upstream with others done in the staging-next
branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This was done to resolve the conflicts that were in a number of files
due to changes done upstream with others done in the staging-next
branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| MAINTAINERS | diff1 | diff2 | blobhistory |
| drivers/staging/brcm80211/brcmfmac/wl_iw.c | diff1 | diff2 | blobhistory |
| drivers/staging/usbip/stub_rx.c | diff1 | diff2 | blobhistory |