projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 461df4d c773298)
Merge Linus's tree into staging-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 9 Jun 2011 20:49:02 +0000 (13:49 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 9 Jun 2011 20:49:02 +0000 (13:49 -0700)
commitdc5a18941b4226846f0c5994e4f45bc685f7bcfe
tree8189cc7586fb875484bce2a7122f2152343904bbtree | snapshot (tar.gz zip)
parent461df4ded3a143f09f9d0e870e7b16b787dc0591commit | diff
parentc773298788598a26e325bc2639877c76818943e3commit | diff
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>
MAINTAINERS diff1 | diff2 | blob | history
drivers/staging/brcm80211/brcmfmac/wl_iw.c diff1 | diff2 | blob | history
drivers/staging/usbip/stub_rx.c diff1 | diff2 | blob | history
Motorola kernel-slsi