]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
projects / can-eth-gw-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d9ff393 8f0d816)
Merge 3.7-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Oct 2012 15:37:12 +0000 (08:37 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Oct 2012 15:37:12 +0000 (08:37 -0700)
commitcb1f6268acd7f1bca7153fa9ca187ffb73f60ab8
tree28695d8b8cbc1876e2e60880f45a502a7ded043dtree | snapshot
parentd9ff3934171b5cf1ac17e5fcd39f3f324b4724cecommit | diff
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64commit | diff
Merge 3.7-rc3 into staging-next

This resolves the conflict with:
drivers/staging/comedi/drivers/amplc_dio200.c
and syncs up the changes that happened in the staging directory for
3.7-rc3.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
15 files changed:
drivers/staging/android/binder.c diff1 | diff2 | blob | history
drivers/staging/comedi/drivers/8255_pci.c diff1 | diff2 | blob | history
drivers/staging/comedi/drivers/amplc_pc236.c diff1 | diff2 | blob | history
drivers/staging/comedi/drivers/amplc_pc263.c diff1 | diff2 | blob | history
drivers/staging/comedi/drivers/das08.c diff1 | diff2 | blob | history
drivers/staging/comedi/drivers/ni_labpc.c diff1 | diff2 | blob | history
drivers/staging/iio/accel/adis16201_core.c diff1 | diff2 | blob | history
drivers/staging/iio/accel/adis16203_core.c diff1 | diff2 | blob | history
drivers/staging/iio/accel/adis16204_core.c diff1 | diff2 | blob | history
drivers/staging/iio/accel/adis16209_core.c diff1 | diff2 | blob | history
drivers/staging/iio/accel/adis16220_core.c diff1 | diff2 | blob | history
drivers/staging/iio/accel/adis16240_core.c diff1 | diff2 | blob | history
drivers/staging/iio/gyro/adis16260_core.c diff1 | diff2 | blob | history
drivers/staging/iio/imu/adis16400_core.c diff1 | diff2 | blob | history
drivers/staging/omapdrm/omap_gem.c diff1 | diff2 | blob | history