| commit | 43a3beb6da994549ec28a9f31727b997a025f958 | |
| author | Greg Kroah-Hartman <gregkh@suse.de> | |
| Tue, 25 Oct 2011 07:18:11 +0000 (25 09:18 +0200) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Tue, 25 Oct 2011 07:18:11 +0000 (25 09:18 +0200) | ||
| tree | 9fea6f7e2abd5ba7ce4d5f725a8ceed0a4e0ab80 | treesnapshot (tar.gz zip) |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 | commitdiff |
| parent | 68cf162a1af23c35db8e3b78659c99196c9882ff | commitdiff |
Merge branch 'staging-next' into Linux 3.1
This was done to resolve a conflict in the
drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build
bugfix in Linus's tree with a "better" bugfix that was in the
staging-next tree that resolved the issue in a more complete manner.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This was done to resolve a conflict in the
drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build
bugfix in Linus's tree with a "better" bugfix that was in the
staging-next tree that resolved the issue in a more complete manner.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| MAINTAINERS | diff1 | diff2 | blobhistory |
| drivers/staging/zcache/zcache-main.c | diff1 | diff2 | blobhistory |