diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 06:37:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 06:38:06 -0700 |
| commit | 03068ff131c0a565e2cb26303a0df63467136723 (patch) | |
| tree | 23fd6cc7d3f21bda56f24d44f6de51fdfbe8dbb9 /drivers/infiniband/ulp | |
| parent | 32235b07b52e948900613e27c5cbd955d084ae8a (diff) | |
| parent | f0e615c3cb72b42191b558c130409335812621d8 (diff) | |
Staging: merge 2.6.39-rc4 into staging-next
This handles the removal of the samsung-laptop driver and other
minor merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/infiniband/ulp')
0 files changed, 0 insertions, 0 deletions