Merge 3.7-rc3 into staging-next (cb1f6268) · Commits · github.com / kvm-riscv / linux

Commit cb1f6268 authored Oct 29, 2012 by

Greg Kroah-Hartman

Merge 3.7-rc3 into staging-next



This resolves the conflict with:
	drivers/staging/comedi/drivers/amplc_dio200.c
and syncs up the changes that happened in the staging directory for
3.7-rc3.

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

parents d9ff3934 8f0d8163

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment