Pandora Sourcecodes - pandora-kernel.git/commit

git.openpandora.org / pandora-kernel.git / commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Wed, 2 May 2012 18:48:07 +0000 (11:48 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Wed, 2 May 2012 18:48:07 +0000 (11:48 -0700)
commit	d210267741fb2a8b6d741d9040703683a39087f4
tree	bfc1cdf7925644367cec4c82f2a5fb6d4c51a8eb	tree \| snapshot
parent	69964ea4c7b68c9399f7977aa5b9aa6539a6a98a	commit \| diff
parent	5bb196ad29c58c3e69dde8ed34b99a07c0719e7f	commit \| diff

Merge 3.4-rc5 into staging-next

This resolves the conflict in:
drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

20 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/inkern.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/persistent_ram.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/magnetometer/ak8975.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/magnetometer/hmc5843.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/as102/as102_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet-rx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/omapdrm/omap_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rts_pstor/ms.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rts_pstor/rtsx_transport.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/sep/sep_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vme/devices/vme_pio2_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6656/ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_init.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_setmode.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_table.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/zsmalloc/zsmalloc-main.c	diff1 \|	diff2 \|	blob \| history

Pandora Kernel Repository

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/inkern.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/persistent_ram.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/magnetometer/ak8975.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/magnetometer/hmc5843.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/as102/as102_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet-rx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/omapdrm/omap_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rts_pstor/ms.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rts_pstor/rtsx_transport.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/sep/sep_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vme/devices/vme_pio2_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6656/ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_init.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_setmode.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_table.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/zsmalloc/zsmalloc-main.c	diff1 \|	diff2 \|	blob \| history