| commit | 24edd08bdaf937aeb0fe6d181b4f187d2d9dcbf4 | |
| author | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Wed, 4 May 2011 02:52:31 +0000 (4 12:52 +1000) | ||
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Wed, 4 May 2011 02:52:31 +0000 (4 12:52 +1000) | ||
| tree | 4a7ee27f81800280993f62d3b2ab3d6f13421479 | treesnapshot (tar.gz zip) |
| parent | b5753dafc3a235f3165ccbe257d8e81b92a01ee3 | commitdiff |
| parent | 7cc82439baf3faa45cbb9f05a6a8b6b55891621a | commitdiff |
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/rt2860/common/cmm_data_pci.c
drivers/staging/rt2860/common/cmm_data_usb.c
Conflicts:
drivers/staging/rt2860/common/cmm_data_pci.c
drivers/staging/rt2860/common/cmm_data_usb.c