Merge branch 'staging-linus' into staging-next

Browse source

Pick up 2 more comedi patches from Ian that are needed for other
changes in the future.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman 2012-09-04 11:58:26 -07:00

parent 0edc7d8381 61ed59ed09

commit c283cf384a

1 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/staging/comedi/drivers/das08.c

View file