git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6016d51 94b1230)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 26 Oct 2012 02:42:53 +0000 (13:42 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 26 Oct 2012 02:42:53 +0000 (13:42 +1100)
commit	8b7456b7fd6cf7823a396eb22a821f23c7c4a27a
tree	9d278bb11ffc78086b718d90825d2d1150396921	tree \| snapshot
parent	6016d518ab25aedcd1bea9e2ade563eeb5a1762b	commit \| diff
parent	94b12302f2792199b1c6b0e6aa38d2915848091e	commit \| diff

Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/comedi/drivers/amplc_dio200.c

17 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/dgrp/dgrp_net_ops.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/dgrp/dgrp_sysfs.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

Linux kernel for KaRo TX COM modules