Greg Kroah-Hartman 80ae3fa5d6 Merge 2.6.38-rc5 into staging-next ... This is to resolve a merge conflict with: drivers/staging/zram/zram_drv.c as pointed out by Stephen Rothwell Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Nitin Gupta <ngupta@vflare.org> Cc: Robert Jennings <rcj@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-02-18 12:11:27 -08:00
..
drivers	Merge 2.6.38-rc5 into staging-next	2011-02-18 12:11:27 -08:00
kcomedilib	…
Kconfig	Staging: Comedi: Fix a few NI module dependencies	2011-02-09 11:39:50 -08:00
Makefile	…
TODO	…
comedi.h	…
comedi_compat32.c	…
comedi_compat32.h	…
comedi_fops.c	staging: comedi: Make INSN_BITS behavior consistent across drivers	2011-01-21 12:35:14 -08:00
comedi_fops.h	…
comedidev.h	…
comedilib.h	…
drivers.c	staging: comedi: fix coding style issue in drivers.c	2011-02-04 13:04:24 -08:00
internal.h	…
proc.c	…
range.c	…