]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13976ab 1530fce)
Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...
authorChuck Anderson <chuck.anderson@oracle.com>
Tue, 31 May 2016 14:49:23 +0000 (07:49 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Tue, 31 May 2016 14:49:23 +0000 (07:49 -0700)
1  2 
block/blk-core.c patch | diff1 | diff2 | blob | history
include/linux/blkdev.h patch | diff1 | diff2 | blob | history

diff --cc block/blk-core.c
Simple merge
diff --cc include/linux/blkdev.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.