]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c3b92c8 68cf162)
Merge branch 'staging-next' into Linux 3.1
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 25 Oct 2011 07:18:11 +0000 (09:18 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 25 Oct 2011 07:18:11 +0000 (09:18 +0200)
commit43a3beb6da994549ec28a9f31727b997a025f958
tree9fea6f7e2abd5ba7ce4d5f725a8ceed0a4e0ab80tree | snapshot
parentc3b92c8787367a8bb53d57d9789b558f1295cc96commit | diff
parent68cf162a1af23c35db8e3b78659c99196c9882ffcommit | diff
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>
MAINTAINERS diff1 | diff2 | blob | history
drivers/staging/zcache/zcache-main.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules