projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9ac6eb4 4a7a4f9)
Merge branch 'staging-linus' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Sep 2012 18:46:38 +0000 (11:46 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Sep 2012 18:46:38 +0000 (11:46 -0700)
commit4d480efacee65eba9b6301dd02d679458d5ce447
tree5876cd6337e254266b4276ee46fd664abb6b38d1tree | snapshot
parent9ac6eb40510bf9e6e82435f78f5c1cb92ee3f97acommit | diff
parent4a7a4f95a5e15648f24a971b36b82adc36d2cb6bcommit | diff
Merge branch 'staging-linus' into staging-next

This gets the 6 staging comedi patches that are needed for further
patches that Ian sent.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/amplc_dio200.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
Domain: System / Uncategorized;