git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ecada1 07bc9dc)
Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 25 Jul 2013 10:30:27 +0000 (12:30 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 25 Jul 2013 10:30:49 +0000 (12:30 +0200)
Sync with Linus' master to be able to apply
trivial patche to newer code.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
1  2 
Documentation/printk-formats.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/printk-formats.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.