diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
| commit | 229aebb873e29726b91e076161649cf45154b0bf (patch) | |
| tree | acc02a3702215bce8d914f4c8cc3d7a1382b1c67 /firmware | |
| parent | 8de547e1824437f3c6af180d3ed2162fa4b3f389 (diff) | |
| parent | 50a23e6eec6f20d55a3a920e47adb455bff6046e (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Update broken web addresses in arch directory.
Update broken web addresses in the kernel.
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Revert "Fix typo: configuation => configuration" partially
ida: document IDA_BITMAP_LONGS calculation
ext2: fix a typo on comment in ext2/inode.c
drivers/scsi: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
fs/seq_file.c: Remove unnecessary casts of private_data
arm: uengine.c: remove C99 comments
arm: scoop.c: remove C99 comments
Fix typo configue => configure in comments
Fix typo: configuation => configuration
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix various typos of valid in comments
...
Fix up trivial conflicts in:
drivers/char/ipmi/ipmi_si_intf.c
drivers/usb/gadget/rndis.c
net/irda/irnet/irnet_ppp.c
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/keyspan_pda/keyspan_pda.S | 2 | ||||
| -rw-r--r-- | firmware/keyspan_pda/xircom_pgs.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/keyspan_pda/keyspan_pda.S b/firmware/keyspan_pda/keyspan_pda.S index 418fe69aa5e0..f3acc197a5ef 100644 --- a/firmware/keyspan_pda/keyspan_pda.S +++ b/firmware/keyspan_pda/keyspan_pda.S | |||
| @@ -74,7 +74,7 @@ | |||
| 74 | * recognizes the new device ID and glues it to the real serial driver code. | 74 | * recognizes the new device ID and glues it to the real serial driver code. |
| 75 | * | 75 | * |
| 76 | * USEFUL DOCS: | 76 | * USEFUL DOCS: |
| 77 | * EzUSB Technical Reference Manual: <http://www.anchorchips.com> | 77 | * EzUSB Technical Reference Manual: <http://www.cypress.com/> |
| 78 | * 8051 manuals: everywhere, but try www.dalsemi.com because the EzUSB is | 78 | * 8051 manuals: everywhere, but try www.dalsemi.com because the EzUSB is |
| 79 | * basically the Dallas enhanced 8051 code. Remember that the EzUSB IO ports | 79 | * basically the Dallas enhanced 8051 code. Remember that the EzUSB IO ports |
| 80 | * use totally different registers! | 80 | * use totally different registers! |
diff --git a/firmware/keyspan_pda/xircom_pgs.S b/firmware/keyspan_pda/xircom_pgs.S index 05d99dd63776..0b79bbf0ae15 100644 --- a/firmware/keyspan_pda/xircom_pgs.S +++ b/firmware/keyspan_pda/xircom_pgs.S | |||
| @@ -74,7 +74,7 @@ | |||
| 74 | * recognizes the new device ID and glues it to the real serial driver code. | 74 | * recognizes the new device ID and glues it to the real serial driver code. |
| 75 | * | 75 | * |
| 76 | * USEFUL DOCS: | 76 | * USEFUL DOCS: |
| 77 | * EzUSB Technical Reference Manual: <http://www.anchorchips.com> | 77 | * EzUSB Technical Reference Manual: <http://www.cypress.com/> |
| 78 | * 8051 manuals: everywhere, but try www.dalsemi.com because the EzUSB is | 78 | * 8051 manuals: everywhere, but try www.dalsemi.com because the EzUSB is |
| 79 | * basically the Dallas enhanced 8051 code. Remember that the EzUSB IO ports | 79 | * basically the Dallas enhanced 8051 code. Remember that the EzUSB IO ports |
| 80 | * use totally different registers! | 80 | * use totally different registers! |