git.karo-electronics.de Git - mv-sheeva.git/commit

]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/char/scx200_gpio.c

author	Greg Kroah-Hartman <gregkh@suse.de>
	Thu, 28 Oct 2010 16:44:56 +0000 (09:44 -0700)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Thu, 28 Oct 2010 16:44:56 +0000 (09:44 -0700)
commit	e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7
tree	ea51b391f7d74ca695dcb9f5e46eb02688a92ed9	tree \| snapshot
parent	81280572ca6f54009edfa4deee563e8678784218	commit \| diff
parent	a4ac0d847af9dd34d5953a5e264400326144b6b2	commit \| diff

Merge 'staging-next' to Linus's tree

This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

40 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/devices.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/autofs/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/autofs/root.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/comedi_fops.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/cb_pcimdas.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/ni_labpc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/rtd520.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/crystalhd/crystalhd_lnx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/dream/pmem.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/frontier/alphatrack.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/frontier/tranzport.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/blkvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/storvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/industrialio-core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/industrialio-ring.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lirc/lirc_imon.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lirc/lirc_sasem.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/quickstart/quickstart.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/smbfs/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/smbfs/dir.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/smbfs/inode.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/smbfs/proc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/spectra/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/rmgr/drv_interface.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/wlags49_h2/wl_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/zram/zram_drv.c	diff1 \|	diff2 \|	blob \| history
fs/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/Makefile	diff1 \|	diff2 \|	blob \| history
fs/compat.c	diff1 \|	diff2 \|	blob \| history
fs/compat_ioctl.c	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
include/linux/tty.h	diff1 \|	diff2 \|	blob \| history

Linux for Marvell Sheeva based platforms

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/devices.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/autofs/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/autofs/root.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/comedi_fops.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/cb_pcimdas.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/ni_labpc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/rtd520.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/crystalhd/crystalhd_lnx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/dream/pmem.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/frontier/alphatrack.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/frontier/tranzport.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/blkvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/storvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/industrialio-core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/industrialio-ring.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lirc/lirc_imon.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lirc/lirc_sasem.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/quickstart/quickstart.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/smbfs/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/smbfs/dir.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/smbfs/inode.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/smbfs/proc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/spectra/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/rmgr/drv_interface.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/wlags49_h2/wl_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/zram/zram_drv.c	diff1 \|	diff2 \|	blob \| history
fs/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/Makefile	diff1 \|	diff2 \|	blob \| history
fs/compat.c	diff1 \|	diff2 \|	blob \| history
fs/compat_ioctl.c	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
include/linux/tty.h	diff1 \|	diff2 \|	blob \| history