summaryrefslogtreecommitdiff
path: root/tools/arch/tile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-12-05 09:41:42 -0200
committerJonathan Corbet <corbet@lwn.net>2016-12-05 14:21:29 -0700
commit79c87c30d0e6d02b2a7d0f1eed372d0979c03930 (patch)
treeec3f971f5863a80f6914b356a3e5ce57f8acb7b0 /tools/arch/tile
parentf15c323397f87b978f4057eb1462efcbf487493a (diff)
docs: 00-INDEX: consolidate process/ and admin-guide/ description
Instead of having descriptions for individual files inside the process/ and admin-guide/ documentation, consolidate them into one entry per directory, just like other descriptions inside 00-INDEX. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'tools/arch/tile')
0 files changed, 0 insertions, 0 deletions
emove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/soc/txx9/Makefile')