]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86d5613 d1db0ee)
Merge 3.15-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Apr 2014 04:36:39 +0000 (21:36 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Apr 2014 04:36:39 +0000 (21:36 -0700)
1  2 
fs/kernfs/dir.c patch | diff1 | diff2 | blob | history
fs/kernfs/file.c patch | diff1 | diff2 | blob | history

diff --cc fs/kernfs/dir.c
Simple merge
diff --cc fs/kernfs/file.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.