Skip to content

Commit 721630d

Browse files
committed
Merge pull request #4 from torvalds/master
Updating working tree with torvalds:master
2 parents 8ed87cd + 0f0ca14 commit 721630d

File tree

3,607 files changed

+212798
-52204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,607 files changed

+212798
-52204
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,6 @@ extra_certificates
9292
signing_key.priv
9393
signing_key.x509
9494
x509.genkey
95+
96+
# Kconfig presets
97+
all.config

CREDITS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -823,8 +823,8 @@ S: D-69231 Rauenberg
823823
S: Germany
824824

825825
N: Jean Delvare
826-
827-
W: http://khali.linux-fr.org/
826+
827+
W: http://jdelvare.nerim.net/
828828
D: Several hardware monitoring drivers
829829
S: France
830830

Documentation/00-INDEX

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ DMA-ISA-LPC.txt
2929
- How to do DMA with ISA (and LPC) devices.
3030
DMA-attributes.txt
3131
- listing of the various possible attributes a DMA region can have
32+
dmatest.txt
33+
- how to compile, configure and use the dmatest system.
3234
DocBook/
3335
- directory with DocBook templates etc. for kernel documentation.
3436
EDID/
@@ -77,6 +79,8 @@ arm/
7779
- directory with info about Linux on the ARM architecture.
7880
arm64/
7981
- directory with info about Linux on the 64 bit ARM architecture.
82+
assoc_array.txt
83+
- generic associative array intro.
8084
atomic_ops.txt
8185
- semantics and behavior of atomic and bitmask operations.
8286
auxdisplay/
@@ -87,6 +91,8 @@ bad_memory.txt
8791
- how to use kernel parameters to exclude bad RAM regions.
8892
basic_profiling.txt
8993
- basic instructions for those who wants to profile Linux kernel.
94+
bcache.txt
95+
- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.
9096
binfmt_misc.txt
9197
- info on the kernel support for extra binary formats.
9298
blackfin/
@@ -171,6 +177,8 @@ early-userspace/
171177
- info about initramfs, klibc, and userspace early during boot.
172178
edac.txt
173179
- information on EDAC - Error Detection And Correction
180+
efi-stub.txt
181+
- How to use the EFI boot stub to bypass GRUB or elilo on EFI systems.
174182
eisa.txt
175183
- info on EISA bus support.
176184
email-clients.txt
@@ -195,8 +203,8 @@ futex-requeue-pi.txt
195203
- info on requeueing of tasks from a non-PI futex to a PI futex
196204
gcov.txt
197205
- use of GCC's coverage testing tool "gcov" with the Linux kernel
198-
gpio.txt
199-
- overview of GPIO (General Purpose Input/Output) access conventions.
206+
gpio/
207+
- gpio related documentation
200208
hid/
201209
- directory with information on human interface devices
202210
highuid.txt
@@ -255,6 +263,8 @@ kernel-docs.txt
255263
- listing of various WWW + books that document kernel internals.
256264
kernel-parameters.txt
257265
- summary listing of command line / boot prompt args for the kernel.
266+
kernel-per-CPU-kthreads.txt
267+
- List of all per-CPU kthreads and how they introduce jitter.
258268
kmemcheck.txt
259269
- info on dynamic checker that detects uses of uninitialized memory.
260270
kmemleak.txt
@@ -299,8 +309,6 @@ memory-devices/
299309
- directory with info on parts like the Texas Instruments EMIF driver
300310
memory-hotplug.txt
301311
- Hotpluggable memory support, how to use and current status.
302-
memory.txt
303-
- info on typical Linux memory problems.
304312
metag/
305313
- directory with info about Linux on Meta architecture.
306314
mips/
@@ -311,6 +319,8 @@ mmc/
311319
- directory with info about the MMC subsystem
312320
mn10300/
313321
- directory with info about the mn10300 architecture port
322+
module-signing.txt
323+
- Kernel module signing for increased security when loading modules.
314324
mtd/
315325
- directory with info about memory technology devices (flash)
316326
mono.txt
@@ -343,6 +353,8 @@ pcmcia/
343353
- info on the Linux PCMCIA driver.
344354
percpu-rw-semaphore.txt
345355
- RCU based read-write semaphore optimized for locking for reading
356+
phy.txt
357+
- Description of the generic PHY framework.
346358
pi-futex.txt
347359
- documentation on lightweight priority inheritance futexes.
348360
pinctrl.txt
@@ -431,6 +443,8 @@ sysrq.txt
431443
- info on the magic SysRq key.
432444
target/
433445
- directory with info on generating TCM v4 fabric .ko modules
446+
this_cpu_ops.txt
447+
- List rationale behind and the way to use this_cpu operations.
434448
thermal/
435449
- directory with information on managing thermal issues (CPU/temp)
436450
trace/
@@ -469,6 +483,8 @@ wimax/
469483
- directory with info about Intel Wireless Wimax Connections
470484
workqueue.txt
471485
- information on the Concurrency Managed Workqueue implementation
486+
ww-mutex-design.txt
487+
- Intro to Mutex wait/would deadlock handling.s
472488
x86/x86_64/
473489
- directory with info on Linux support for AMD x86-64 (Hammer) machines.
474490
xtensa/

Documentation/ABI/testing/configfs-usb-gadget

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
What: /config/usb-gadget
22
Date: Jun 2013
3-
KenelVersion: 3.11
3+
KernelVersion: 3.11
44
Description:
55
This group contains sub-groups corresponding to created
66
USB gadgets.
77

88
What: /config/usb-gadget/gadget
99
Date: Jun 2013
10-
KenelVersion: 3.11
10+
KernelVersion: 3.11
1111
Description:
1212

1313
The attributes of a gadget:
@@ -27,7 +27,7 @@ Description:
2727

2828
What: /config/usb-gadget/gadget/configs
2929
Date: Jun 2013
30-
KenelVersion: 3.11
30+
KernelVersion: 3.11
3131
Description:
3232
This group contains a USB gadget's configurations
3333

@@ -58,20 +58,20 @@ Description:
5858

5959
What: /config/usb-gadget/gadget/functions
6060
Date: Jun 2013
61-
KenelVersion: 3.11
61+
KernelVersion: 3.11
6262
Description:
6363
This group contains functions available to this USB gadget.
6464

6565
What: /config/usb-gadget/gadget/strings
6666
Date: Jun 2013
67-
KenelVersion: 3.11
67+
KernelVersion: 3.11
6868
Description:
6969
This group contains subdirectories for language-specific
7070
strings for this gadget.
7171

7272
What: /config/usb-gadget/gadget/strings/language
7373
Date: Jun 2013
74-
KenelVersion: 3.11
74+
KernelVersion: 3.11
7575
Description:
7676
The attributes:
7777

Documentation/ABI/testing/configfs-usb-gadget-acm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /config/usb-gadget/gadget/functions/acm.name
22
Date: Jun 2013
3-
KenelVersion: 3.11
3+
KernelVersion: 3.11
44
Description:
55

66
This item contains just one readonly attribute: port_num.

Documentation/ABI/testing/configfs-usb-gadget-ecm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /config/usb-gadget/gadget/functions/ecm.name
22
Date: Jun 2013
3-
KenelVersion: 3.11
3+
KernelVersion: 3.11
44
Description:
55
The attributes:
66

Documentation/ABI/testing/configfs-usb-gadget-eem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /config/usb-gadget/gadget/functions/eem.name
22
Date: Jun 2013
3-
KenelVersion: 3.11
3+
KernelVersion: 3.11
44
Description:
55
The attributes:
66

Documentation/ABI/testing/configfs-usb-gadget-ffs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /config/usb-gadget/gadget/functions/ffs.name
22
Date: Nov 2013
3-
KenelVersion: 3.13
3+
KernelVersion: 3.13
44
Description: The purpose of this directory is to create and remove it.
55

66
A corresponding USB function instance is created/removed.

Documentation/ABI/testing/configfs-usb-gadget-loopback

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /config/usb-gadget/gadget/functions/Loopback.name
22
Date: Nov 2013
3-
KenelVersion: 3.13
3+
KernelVersion: 3.13
44
Description:
55
The attributes:
66

Documentation/ABI/testing/configfs-usb-gadget-mass-storage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /config/usb-gadget/gadget/functions/mass_storage.name
22
Date: Oct 2013
3-
KenelVersion: 3.13
3+
KernelVersion: 3.13
44
Description:
55
The attributes:
66

@@ -13,7 +13,7 @@ Description:
1313

1414
What: /config/usb-gadget/gadget/functions/mass_storage.name/lun.name
1515
Date: Oct 2013
16-
KenelVersion: 3.13
16+
KernelVersion: 3.13
1717
Description:
1818
The attributes:
1919

0 commit comments

Comments
 (0)