projects
/
GitHub
/
LineageOS
/
android_kernel_samsung_universal7580.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
af0c25c
fe0d422
)
Merge Linux 3.0-rc6 into staging-next
author
Greg Kroah-Hartman
<gregkh@suse.de>
Tue, 5 Jul 2011 14:35:09 +0000
(07:35 -0700)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Tue, 5 Jul 2011 14:35:09 +0000
(07:35 -0700)
This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1
2
Documentation/feature-removal-schedule.txt
patch
|
diff1
|
diff2
|
blob
|
history
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/iio/accel/adis16201.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/iio/accel/adis16203.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/iio/accel/adis16204.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/iio/accel/adis16209.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/iio/gyro/adis16260.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/mei/init.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/mei/wd.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/feature-removal-schedule.txt
Simple merge
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/staging/iio/accel/adis16201.h
Simple merge
diff --cc
drivers/staging/iio/accel/adis16203.h
Simple merge
diff --cc
drivers/staging/iio/accel/adis16204.h
Simple merge
diff --cc
drivers/staging/iio/accel/adis16209.h
Simple merge
diff --cc
drivers/staging/iio/gyro/adis16260.h
Simple merge
diff --cc
drivers/staging/mei/init.c
Simple merge
diff --cc
drivers/staging/mei/wd.c
Simple merge