git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d7f9729 e16a922)
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)
commit17cb3be61b45d716f6b21a9380925493413ce0ed
treed29ca8bc010a22f358032346d7e7b6887c455e08tree | snapshot
parentd7f9729f6e06c9613a88a18c4e1fbbdf2f6146fdcommit | diff
parente16a922a27ec352537a8027cadc32dc156534ca5commit | 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
Pandora Kernel Repository