]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d35cc56 4b660a7)
Merge 3.15-rc6 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 May 2014 01:13:53 +0000 (10:13 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 May 2014 01:13:53 +0000 (10:13 +0900)
We want the kernfs fixes in this branch as well for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
fs/kernfs/file.c patch | diff1 | diff2 | blob | history
include/linux/kernfs.h patch | diff1 | diff2 | blob | history

diff --cc fs/kernfs/file.c
Simple merge
diff --cc include/linux/kernfs.h
Simple merge
XArray, radix tree and IDR