]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6d2f7ea 3d1fe3f)
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 06:44:43 +0000 (16:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 06:44:43 +0000 (16:44 +1000)
commita95a67042d861035b7b2b67e9da36d0ac84945c3
tree3ce248c06f6328b872f3afdd7a4122026b4e238atree | snapshot
parent6d2f7eae210bf566bd528a0171c67d29a8036562commit | diff
parent3d1fe3f785c80e17f62acf8f92570ae9210bd588commit | diff
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/ccg/f_fs.c
drivers/staging/ccg/rndis.c
drivers/staging/dgrp/dgrp_dpa_ops.c
drivers/staging/dgrp/dgrp_mon_ops.c
drivers/staging/dgrp/dgrp_net_ops.c
drivers/staging/dgrp/dgrp_ports_ops.c
drivers/staging/dgrp/dgrp_specproc.c
drivers/staging/vt6655/device_main.c
13 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/hwmon/Kconfig diff1 | diff2 | blob | history
drivers/hwmon/Makefile diff1 | diff2 | blob | history
drivers/staging/csr/drv.c diff1 | diff2 | blob | history
drivers/staging/dgrp/dgrp_common.h diff1 | diff2 | blob | history
drivers/staging/dgrp/dgrp_net_ops.c diff1 | diff2 | blob | history
drivers/staging/fwserial/fwserial.c diff1 | diff2 | blob | history
drivers/staging/gdm72xx/netlink_k.c diff1 | diff2 | blob | history
drivers/staging/rts5139/rts51x_scsi.c diff1 | diff2 | blob | history
drivers/staging/rts5139/rts51x_scsi.h diff1 | diff2 | blob | history
drivers/staging/silicom/bpctl_mod.c diff1 | diff2 | blob | history
drivers/staging/vt6655/device_main.c diff1 | diff2 | blob | history
drivers/staging/vt6656/main_usb.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules