]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f2a772a c0095b1)
Merge branch 'staging-linus' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Jan 2013 23:17:52 +0000 (15:17 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Jan 2013 23:17:52 +0000 (15:17 -0800)
commit0991c0d4276fcf69d46aaabdacf8ba7630d1537e
treed29ca8bc010a22f358032346d7e7b6887c455e08tree | snapshot
parentf2a772a7d40a546c8e5b1b10bdcfd1707403a00ccommit | diff
parentc0095b191489f98e447869d834d4f54cb28a5189commit | diff
Merge branch 'staging-linus' into staging-next

This is to get the comedi fixes, and resolve the issue in comdi_test.c
and comedi_fops.c that were caused by changes in both branches.

It also allows the fwserial driver changes to be applied, as they
required the fixes that are in staging-linus.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/adc/max1363.c diff1 | diff2 | blob | history
drivers/staging/comedi/comedi_fops.c diff1 | diff2 | blob | history
drivers/staging/speakup/synth.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.