projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dc47ce9
1d06825
)
Merge 3.2-rc5 into staging-next
author
Greg Kroah-Hartman
<gregkh@suse.de>
Sat, 10 Dec 2011 03:01:27 +0000
(19:01 -0800)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Sat, 10 Dec 2011 03:01:27 +0000
(19:01 -0800)
This resolves the conflict in the
drivers/staging/iio/industrialio-core.c file due to two different
changes made to resolve the same problem.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/comedi/comedi_fops.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/comedi/drivers/usbduxsigma.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/iio/industrialio-core.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/staging/comedi/comedi_fops.c
Simple merge
diff --cc
drivers/staging/comedi/drivers/usbduxsigma.c
Simple merge
diff --cc
drivers/staging/iio/industrialio-core.c
Simple merge