summaryrefslogtreecommitdiff
path: root/Documentation/DocBook/kernel-hacking.tmpl
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-03-28 17:13:25 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2014-03-28 17:13:29 +1100
commit657af6b501a2511fb6bebcca0de3e4c1685186b6 (patch)
tree54c2adec1302650f5095950a2ef127298128a9d2 /Documentation/DocBook/kernel-hacking.tmpl
parentae93185a4cc7a0a56d8b5fc2077548c1a0d3f677 (diff)
parentf684c699592229c3aebf656363bcb0cf86df2570 (diff)
Merge branch 'akpm-current/current'
Conflicts: fs/fs-writeback.c
Diffstat (limited to 'Documentation/DocBook/kernel-hacking.tmpl')
0 files changed, 0 insertions, 0 deletions