Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 173775
b: refs/heads/master
c: f6c4c81
h: refs/heads/master
i:
  173773: 9b96021
  173771: cca975e
  173767: ca7f41f
  173759: 0b7f98c
v: v3
  • Loading branch information
Linus Torvalds committed Dec 10, 2009
1 parent 2468469 commit 69c0d60
Show file tree
Hide file tree
Showing 3,496 changed files with 252,374 additions and 112,623 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 447753d97764b0ae3969936ec495e794baa88052
refs/heads/master: f6c4c8195b5e7878823caa1181be404d9e86d369
8 changes: 8 additions & 0 deletions trunk/Documentation/ABI/stable/sysfs-driver-qla2xxx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
What: /sys/bus/pci/drivers/qla2xxx/.../devices/*
Date: September 2009
Contact: QLogic Linux Driver <linux-driver@qlogic.com>
Description: qla2xxx-udev.sh currently looks for uevent CHANGE events to
signal a firmware-dump has been generated by the driver and is
ready for retrieval.
Users: qla2xxx-udev.sh. Proposed changes should be mailed to
linux-driver@qlogic.com
6 changes: 3 additions & 3 deletions trunk/Documentation/DMA-mapping.txt
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ most specific mask.
Here is pseudo-code showing how this might be done:

#define PLAYBACK_ADDRESS_BITS DMA_BIT_MASK(32)
#define RECORD_ADDRESS_BITS 0x00ffffff
#define RECORD_ADDRESS_BITS DMA_BIT_MASK(24)

struct my_sound_card *card;
struct pci_dev *pdev;
Expand All @@ -224,14 +224,14 @@ Here is pseudo-code showing how this might be done:
card->playback_enabled = 1;
} else {
card->playback_enabled = 0;
printk(KERN_WARN "%s: Playback disabled due to DMA limitations.\n",
printk(KERN_WARNING "%s: Playback disabled due to DMA limitations.\n",
card->name);
}
if (!pci_set_dma_mask(pdev, RECORD_ADDRESS_BITS)) {
card->record_enabled = 1;
} else {
card->record_enabled = 0;
printk(KERN_WARN "%s: Record disabled due to DMA limitations.\n",
printk(KERN_WARNING "%s: Record disabled due to DMA limitations.\n",
card->name);
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/kernel-hacking.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ asmlinkage long sys_mycall(int arg)
</para>

<programlisting>
if (signal_pending())
if (signal_pending(current))
return -ERESTARTSYS;
</programlisting>

Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ Maintainers
This board is maintained by Simtec Electronics.


(c) 2004 Ben Dooks, Simtec Electronics
Copyright 2004 Ben Dooks, Simtec Electronics
2 changes: 1 addition & 1 deletion trunk/Documentation/arm/Samsung-S3C24XX/GPIO.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,4 @@ Authour


Ben Dooks, 03 October 2004
(c) 2004 Ben Dooks, Simtec Electronics
Copyright 2004 Ben Dooks, Simtec Electronics
2 changes: 1 addition & 1 deletion trunk/Documentation/arm/Samsung-S3C24XX/Overview.txt
Original file line number Diff line number Diff line change
Expand Up @@ -299,4 +299,4 @@ Port Contributors
Document Author
---------------

Ben Dooks, (c) 2004-2005,2006 Simtec Electronics
Ben Dooks, Copyright 2004-2006 Simtec Electronics
2 changes: 1 addition & 1 deletion trunk/Documentation/arm/Samsung-S3C24XX/S3C2412.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@ ATA
Document Author
---------------

Ben Dooks, (c) 2006 Simtec Electronics
Ben Dooks, Copyright 2006 Simtec Electronics
2 changes: 1 addition & 1 deletion trunk/Documentation/arm/Samsung-S3C24XX/S3C2413.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ Camera Interface
Document Author
---------------

Ben Dooks, (c) 2006 Simtec Electronics
Ben Dooks, Copyright 2006 Simtec Electronics
2 changes: 1 addition & 1 deletion trunk/Documentation/arm/Samsung-S3C24XX/Suspend.txt
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,5 @@ Configuration
Document Author
---------------

Ben Dooks, (c) 2004 Simtec Electronics
Ben Dooks, Copyright 2004 Simtec Electronics

2 changes: 1 addition & 1 deletion trunk/Documentation/arm/Samsung-S3C24XX/USB-Host.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ Platform Data
Document Author
---------------

Ben Dooks, (c) 2005 Simtec Electronics
Ben Dooks, Copyright 2005 Simtec Electronics
Loading

0 comments on commit 69c0d60

Please sign in to comment.